This should apply cleanly to 21.5 also. 21.4 patch: ChangeLog files diff command: cvs -q diff -U 0 Files affected: src/ChangeLog Source files diff command: cvs -q diff -uN Files affected: src/unexelf.c Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.290.2.82 diff -u -U0 -r1.290.2.82 ChangeLog --- src/ChangeLog 9 Jan 2005 18:45:38 -0000 1.290.2.82 +++ src/ChangeLog 10 Jan 2005 03:27:53 -0000 ＠＠ -0,0 +1,6 ＠＠ +2005-01-10 Steve Youngs <steve(a)sxemacs.org&gt; + + From Andrey Slusar <anrays(a)gmail.com&gt;: + + * unexelf.c: define `Elfw(type)' for FreeBSD alpha and amd64. + Index: src/unexelf.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unexelf.c,v retrieving revision 1.15.2.1 diff -u -u -r1.15.2.1 unexelf.c --- src/unexelf.c 20 Aug 2002 11:38:23 -0000 1.15.2.1 +++ src/unexelf.c 10 Jan 2005 03:27:24 -0000 ＠＠ -475,6 +475,14 ＠＠ # include <sys/exec_elf.h> #endif +#if defined(__FreeBSD__) && (defined(__alpha__) || defined(__amd64__)) +# ifdef __STDC__ +# define ElfW(type) Elf64_##type +# else +# define ElfW(type) Elf64_/**/type +# endif +#endif + #if __GNU_LIBRARY__ - 0 >= 6 # include <link.h> /* get ElfW etc */ #endif -- |---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---| | In space, | | No one can hear you rip a stinky | |------------------------------------&lt;steve(a)sxemacs.org&gt;---|