User: aidan Date: 05/03/25 17:35:06 Modified: xemacs/src ChangeLog unexelf.c Log: Andrey Slusar's FreeBSD fixes for fakemail.c, unexelf.c, as sent in 86d5uq2e3i.fsf(a)santinel.home.ua . Revision Changes Path 1.190 +6 -0 XEmacs/xemacs/lib-src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v retrieving revision 1.189 retrieving revision 1.190 diff -u -p -r1.189 -r1.190 --- ChangeLog 2005/03/11 19:21:27 1.189 +++ ChangeLog 2005/03/25 16:34:53 1.190 ＠＠ -1,3 +1,9 ＠＠ +2005-03-25 Andrey Slusar <anrays(a)gmail.com&gt; + + * fakemail.c (CURRENT_USER): Define it if FreeBSD version is >= + 400000. Also, when FreeBSD version is >= 400000 geteuid returns + uid_t instead of unsigned short. + 2005-03-11 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * XEmacs 21.5.20 "cilantro" is released. 1.9 +9 -1 XEmacs/xemacs/lib-src/fakemail.c Index: fakemail.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/fakemail.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- fakemail.c 2005/01/26 09:53:28 1.8 +++ fakemail.c 2005/03/25 16:34:54 1.9 ＠＠ -149,9 +149,17 ＠＠ extern int fclose (), pclose (); extern char *malloc (), *realloc (); #endif +#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000 +#define CURRENT_USER +#endif + #ifdef CURRENT_USER extern struct passwd *getpwuid (); -extern unsigned short geteuid (); +#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000 +extern uid_t geteuid (); +#else +extern unsigned short geteuid (); +#endif static struct passwd *my_entry; #define cuserid(s) \ (my_entry = getpwuid ((int) geteuid ()), \ 1.816 +4 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.815 retrieving revision 1.816 diff -u -p -r1.815 -r1.816 --- ChangeLog 2005/03/25 01:00:32 1.815 +++ ChangeLog 2005/03/25 16:34:57 1.816 ＠＠ -1,3 +1,7 ＠＠ +2005-02-24 Andrey Slusar <anrays(a)gmail.com&gt; + + * unexelf.c: define `Elfw(type)' for FreeBSD alpha and amd64. + 2005-03-25 Marcus Crestani <crestani(a)xemacs.org&gt; * device-x.c: Include process.h for egetenv. 1.17 +8 -0 XEmacs/xemacs/src/unexelf.c Index: unexelf.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unexelf.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- unexelf.c 2004/09/20 19:20:05 1.16 +++ unexelf.c 2005/03/25 16:35:00 1.17 ＠＠ -477,6 +477,14 ＠＠ typedef struct { # 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