[CORE (21.4)] FreeBSD build fixes

A couple of FreeBSD build fixes that one of my developers picked up. I just had a quick look at 21.5 and it looks like this is needed there too. 21.4 patch: ChangeLog files diff command: cvs -q diff -U 0 Files affected: src/ChangeLog lib-src/ChangeLog Source files diff command: cvs -q diff -uN Files affected: src/s/freebsd.h lib-src/fakemail.c Index: lib-src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v retrieving revision 1.115.2.25 diff -u -U0 -r1.115.2.25 ChangeLog --- lib-src/ChangeLog 6 Dec 2004 01:08:10 -0000 1.115.2.25 +++ lib-src/ChangeLog 8 Jan 2005 18:04:25 -0000 ＠＠ -0,0 +1,8 ＠＠ +2005-01-09 Steve Youngs <steve(a)sxemacs.org&gt; + + From 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. + Index: lib-src/fakemail.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/fakemail.c,v retrieving revision 1.5 diff -u -u -r1.5 fakemail.c --- lib-src/fakemail.c 12 Apr 2001 18:21:01 -0000 1.5 +++ lib-src/fakemail.c 8 Jan 2005 18:03:41 -0000 ＠＠ -149,9 +149,17 ＠＠ extern char *malloc (), *realloc (); #endif +#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000 +#define CURRENT_USER +#endif + #ifdef CURRENT_USER extern struct passwd *getpwuid (); +#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 ()), \ Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.290.2.81 diff -u -U0 -r1.290.2.81 ChangeLog --- src/ChangeLog 6 Dec 2004 01:08:29 -0000 1.290.2.81 +++ src/ChangeLog 8 Jan 2005 18:04:39 -0000 ＠＠ -0,0 +1,7 ＠＠ +2005-01-09 Steve Youngs <steve(a)sxemacs.org&gt; + + From Andrey Slusar <anrays(a)gmail.com&gt;: + + * s/freebsd.h (LIBS_SYSTEM): Only set to "-lutil -lxpg4" if + FreeBSD version is >= 199701 _and_ < 600006. + Index: src/s/freebsd.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/s/freebsd.h,v retrieving revision 1.20 diff -u -u -r1.20 freebsd.h --- src/s/freebsd.h 12 Apr 2001 18:24:42 -0000 1.20 +++ src/s/freebsd.h 8 Jan 2005 18:03:46 -0000 ＠＠ -29,7 +29,7 ＠＠ #ifndef __FreeBSD_version #include <osreldate.h> #endif -#if __FreeBSD_version >= 199701 +#if __FreeBSD_version >= 199701 && __FreeBSD_version < 600006 #define LIBS_SYSTEM "-lutil -lxpg4" #else #define LIBS_SYSTEM "-lutil" -- |---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---| | In space, | | No one can hear you rip a stinky | |------------------------------------&lt;steve(a)sxemacs.org&gt;---|