Use __NBSD_LIBC to specialize common headers for NetBSD headers compilation.

This patch contains the required changes (under __NBSD_LIBC definition) of the common headers to compile the NetBSD libc.

diff --git a/common/include/minix/ansi.h b/common/include/minix/ansi.h
index 7ff8e78555f0822ac3661b4813155d5419ac760b..ede54fa330d20619221ef00abbfd463f2b2938ee 100644 (file)
--- a/common/include/minix/ansi.h
+++ b/common/include/minix/ansi.h
@@ -69,8 +69,10 @@
 #define _POSIX_SOURCE  1
 #endif
 
+#ifndef __NBSD_LIBC
 /* What is a va_list? */
 #include <stdarg.h>
 #define _BSD_VA_LIST_ va_list
+#endif /* !__NBSD_LIBC */
 
 #endif /* _MINIX_ANSI_H */

diff --git a/common/include/termios.h b/common/include/termios.h
index a0b0f65171363c1bc1099362ee3de96c8a4eac9c..5354c52308f15b54b0e04dfd4c478714b08a2ede 100644 (file)
--- a/common/include/termios.h
+++ b/common/include/termios.h
@@ -74,6 +74,9 @@ struct termios {
 #define VSTART               9 /* cc_c[VSTART] = START char (^S) */
 #define VSTOP               10 /* cc_c[VSTOP] = STOP char (^Q) */
 
+#ifdef __NBSD_LIBC
+/* This is defined in <unistd.h> in NetBSD headers.
+#else /* !__NBSD_LIBC */
 #define _POSIX_VDISABLE          (cc_t)0xFF    /* You can't even generate this 
                                         * character with 'normal' keyboards.
                                         * But some language specific keyboards
@@ -81,6 +84,7 @@ struct termios {
                                         * 256 are used, so cc_t should be a
                                         * short...
                                         */
+#endif /* !__NBSD_LIBC */
 
 /* Values for the baud rate settings.  POSIX Table 7-6. */
 #define B0             0x0000  /* hang up the line */