Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-2-0]: src/tools/compat Pull up revision 1.36 (requested by jmc in...



details:   https://anonhg.NetBSD.org/src/rev/8167c6754a08
branches:  netbsd-2-0
changeset: 561378:8167c6754a08
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jun 14 20:19:44 2004 +0000

description:
Pull up revision 1.36 (requested by jmc in ticket #495):
Before sucking in stdlib.h check if this is NetBSD. If so, explicitly make
sure to use _POSIX_C_SOURCE and undef _NETBSD_SOURCE so the myriad of NetBSD
extentions don't get pulled into scope (and likely conflict at some point
with branched code trying to build on -current due to drift). Fixes PR#25533
XXX: The entire process here is just wacky and the entire cross tools process
needed to be reviewed to build clean w. just _POSIX_C_SOURCE or the equiv
set on NetBSD hosts or this will lose again somewhere..

diffstat:

 tools/compat/compat_defs.h |  14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r 4c620fa1484c -r 8167c6754a08 tools/compat/compat_defs.h
--- a/tools/compat/compat_defs.h        Mon Jun 14 18:26:01 2004 +0000
+++ b/tools/compat/compat_defs.h        Mon Jun 14 20:19:44 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_defs.h,v 1.31 2003/10/27 00:12:42 lukem Exp $   */
+/*     $NetBSD: compat_defs.h,v 1.31.2.1 2004/06/14 20:19:44 tron Exp $        */
 
 #ifndef        __NETBSD_COMPAT_DEFS_H__
 #define        __NETBSD_COMPAT_DEFS_H__
@@ -32,7 +32,19 @@
 #include <paths.h>
 #include <stdarg.h>
 #include <stdio.h>
+
+/* So extra NetBSD extentions don't get pulled in */
+#ifdef __NetBSD__
+#define _POSIX_C_SOURCE
+#undef _NETBSD_SOURCE
+#endif
+
 #include <stdlib.h>
+
+#ifdef __NetBSD__
+#undef _POSIX_C_SOURCE
+#endif
+
 #include <string.h>
 
 #if HAVE_SYS_CDEFS_H



Home | Main Index | Thread Index | Old Index