include - minor compile fixes (including <ansi.h> in files that use it)

workaround for kernel/debug.h that causes <ansi.h> to be included in mpx.S
indirectly.

diff --git a/include/ansi.h b/include/ansi.h
index 9d3d8a1357bd59bb9033f82cf777485b465be70d..34f7c1559ab1ffa778919679c8ab99fa482bab80 100644 (file)
--- a/include/ansi.h
+++ b/include/ansi.h
@@ -69,4 +69,8 @@
 #define _POSIX_SOURCE  1
 #endif
 
+/* What is a va_list? */
+#include <stdarg.h>
+#define _BSD_VA_LIST_ va_list
+
 #endif /* ANSI_H */

diff --git a/include/err.h b/include/err.h
index c8e6df506598985644271f2523ffc11341eb49ba..e44709ba5d4095bad9226927f7cf702c3c9326ee 100644 (file)
--- a/include/err.h
+++ b/include/err.h
@@ -34,10 +34,6 @@
 #ifndef _ERR_H_
 #define        _ERR_H_
 
-#ifdef __minix
-#define _BSD_VA_LIST_ va_list
-#include <stdarg.h>
-#else
 /*
  * Don't use va_list in the err/warn prototypes.   Va_list is typedef'd in two
  * places (<machine/varargs.h> and <machine/stdarg.h>), so if we include one
@@ -45,6 +41,9 @@
  * for utilities to have to include one of them to include err.h, so we get
  * _BSD_VA_LIST_ from <machine/ansi.h> and use it.
  */
+#ifdef __minix
+#include <ansi.h>
+#else
 #include <machine/ansi.h>
 #endif
 #include <sys/cdefs.h>

diff --git a/include/strings.h b/include/strings.h
index f6ce07febc97152951c4886157363e9b537df11e..6432e469c308f17ae60e7575f0f89e07c78a658d 100644 (file)
--- a/include/strings.h
+++ b/include/strings.h
@@ -2,6 +2,8 @@
 strings.h
 */
 
+#include <ansi.h>
+
 /* Open Group Base Specifications Issue 6 (not complete) */
 _PROTOTYPE( char *index, (const char *_s, int _charwanted)             );
 _PROTOTYPE( int strcasecmp, (const char *_s1, const char *_s2)         );

diff --git a/include/util.h b/include/util.h
index bf8ec2d86197ba33b00dba115dccb2ee2d9f3b0c..45ff06c261a95e411cbef90490258bd19a8aa773 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -38,6 +38,7 @@
 #include <pwd.h>
 #include <termios.h>
 #include <utmp.h>
+#include <ansi.h>
 
 #ifdef  _BSD_TIME_T_
 typedef _BSD_TIME_T_    time_t;

diff --git a/kernel/debug.h b/kernel/debug.h
index 575e0b4efd2305c161aeb62131830e841cd05e35..d0a830290382b87cfc49537cb637fee6ce4c2c25 100644 (file)
--- a/kernel/debug.h
+++ b/kernel/debug.h
@@ -7,9 +7,11 @@
  * other kernel headers.
  */
 
+#ifndef __ASSEMBLY__
 #include <ansi.h>
 #include <minix/debug.h>
 #include "config.h"
+#endif
 
 /* Enable prints such as
  *  . send/receive failed due to deadlock or dead source or dead destination