<ansi.h> -> <minix/ansi.h>

diff --git a/Makefile b/Makefile
index ab4b1e01ab3b854dc13ba64921b7781cffbb6b8a..c01893e8adfa49f864e26917866379837a3f8512 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ gnu-includes: includes
        SHELL=/bin/sh; if [ -f $(MKHEADERS443) ] ; then sh -e $(MKHEADERS443) ; fi
        SHELL=/bin/sh; if [ -f $(MKHEADERS443_PKGSRC) ] ; then sh -e $(MKHEADERS443_PKGSRC) ; fi
 
-gnu-libraries: gnu-includes
+gnu-libraries: #gnu-includes
        $(MAKE) -C lib build_gnu
 
 clang-libraries: includes

diff --git a/commands/autil/object.h b/commands/autil/object.h
index e32b5ae1b85a82524388342acc93e15c209e38ae..60d0e1fd3e6432940205d20c1eac618e03f3cb4a 100644 (file)
--- a/commands/autil/object.h
+++ b/commands/autil/object.h
@@ -3,7 +3,7 @@
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
 
-#include <ansi.h>
+#include <minix/ansi.h>
 
 #ifndef __OBJECT_INCLUDED__
 #define __OBJECT_INCLUDED__

diff --git a/commands/cawf/ansi.h b/commands/cawf/ansi.h
index 78fffbe63325bc51f2179097d36cc7c9f8586859..2fa78a2586f8fb599d08c6c58e7f1e91abbed960 100644 (file)
--- a/commands/cawf/ansi.h
+++ b/commands/cawf/ansi.h
@@ -1,4 +1,4 @@
-/* The <ansi.h> header attempts to decide whether the compiler has enough
+/* The <minix/ansi.h> header attempts to decide whether the compiler has enough
  * conformance to Standard C for Minix to take advantage of.  If so, the
  * symbol _ANSI is defined (as 31415).  Otherwise _ANSI is not defined
  * here, but it may be defined by applications that want to bend the rules.
@@ -18,8 +18,8 @@
  * The appropriate macros are defined here.
  */
 
-#ifndef _ANSI_H
-#define _ANSI_H
+#ifndef _MINIX_ANSI_H
+#define _MINIX_ANSI_H
 
 #if __STDC__ == 1
 #define _ANSI          31459   /* compiler claims full ANSI conformance */
@@ -53,4 +53,4 @@
 
 #endif /* _ANSI */
 
-#endif /* ANSI_H */
+#endif /* _MINIX_ANSI_H */

diff --git a/commands/dis386/dise.c b/commands/dis386/dise.c
index 6ab857663bff5bc3a95cc23d70d417c2ca490563..913a1c5c265ecfeb02028fe7b03f47bfa489e043 100644 (file)
--- a/commands/dis386/dise.c
+++ b/commands/dis386/dise.c
@@ -17,7 +17,7 @@
 #include <minix/config.h>
 #include <minix/const.h>
 #include <a.out.h>
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <assert.h>
 #include <ctype.h>
 #include <fcntl.h>

diff --git a/commands/dis386/diso.c b/commands/dis386/diso.c
index 79a70cf57163664d822e2dcb60bff63b40a12950..4eb86ad2281eb27cf5208bcac8fbba1e2b0b271e 100644 (file)
--- a/commands/dis386/diso.c
+++ b/commands/dis386/diso.c
@@ -17,7 +17,7 @@
 #include <minix/config.h>
 #include <minix/const.h>
 #include <a.out.h>
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <assert.h>
 #include <ctype.h>
 #include <fcntl.h>

diff --git a/commands/elle/eeproto.h b/commands/elle/eeproto.h
index e2628c6f4b6087ba0760c777e196dd842ca821e5..9b50fd1eba6036ebc538d134b462a9efc90a9281 100644 (file)
--- a/commands/elle/eeproto.h
+++ b/commands/elle/eeproto.h
@@ -1,5 +1,5 @@
 #ifndef _ANSI
-#include <ansi.h>
+#include <minix/ansi.h>
 #endif
 
 /* eebit.c */

diff --git a/commands/elle/sbproto.h b/commands/elle/sbproto.h
index a7ad5455df815f587bca09bd993dd01d5df7a466..6da70c86a27c52130d3326ffdd7490c9a9e040be 100644 (file)
--- a/commands/elle/sbproto.h
+++ b/commands/elle/sbproto.h
@@ -1,5 +1,5 @@
 #ifndef _ANSI
-#include <ansi.h>
+#include <minix/ansi.h>
 #endif
 
 /* sbbcpy.c */

diff --git a/commands/mdb/mdb.h b/commands/mdb/mdb.h
index e2160d196b4b55aa8fd10cc9bc496e370c555299..206b43c58349515c67ca4738d1f76b64519af362 100644 (file)
--- a/commands/mdb/mdb.h
+++ b/commands/mdb/mdb.h
@@ -36,7 +36,7 @@
 
 
 #include <minix/config.h>
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <sys/types.h>
 
 #include <minix/const.h>

diff --git a/include/Makefile b/include/Makefile
index 5e10824e1b4ea7b4a473a46f1383fd20928e6fb9..f38e4e8e6440948b99620a7765d40bcf8e673156 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,6 +1,6 @@
 # Doing a make includes builds /usr/include
 
-INCS=  alloca.h ansi.h a.out.h ar.h assert.h configfile.h ctype.h \
+INCS=  alloca.h a.out.h ar.h assert.h configfile.h ctype.h \
        curses.h dirent.h env.h err.h errno.h fcntl.h fenv.h \
        float.h fnmatch.h fts.h getopt.h glob.h grp.h ifaddrs.h \
        inttypes.h libgen.h lib.h libutil.h limits.h locale.h \
@@ -29,7 +29,7 @@ INCS+=        minix/a.out.h minix/bitmap.h minix/callnr.h minix/cdrom.h \
        minix/sysutil.h minix/timers.h minix/tty.h minix/type.h minix/types.h \
        minix/u64.h minix/vfsif.h minix/vm.h minix/vtreefs.h minix/gcov.h  \
        minix/compiler.h minix/compiler-ack.h minix/sha2.h minix/sha1.h minix/md5.h \
-       minix/audio_fw.h minix/hash.h minix/input.h
+       minix/audio_fw.h minix/hash.h minix/input.h minix/ansi.h
 INCS+= net/hton.h net/if.h net/ioctl.h net/netlib.h
 INCS+= net/gen/arp_io.h net/gen/dhcp.h net/gen/ether.h \
        net/gen/eth_hdr.h net/gen/eth_io.h net/gen/icmp.h \

diff --git a/include/assert.h b/include/assert.h
index 13f3422dd9fe306a8016d48b043e457f3ba67da4..20f52d7f04aecca7f5a868657e567b7f89a69316 100644 (file)
--- a/include/assert.h
+++ b/include/assert.h
@@ -15,8 +15,8 @@
 
 #undef assert
 
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 #ifdef NDEBUG

diff --git a/include/ctype.h b/include/ctype.h
index 639388cc1c87c536401e7e1791d4edfd13f67a7b..1b40173c194dd0ef5b7e0c11a23e98fe6fa917dd 100644 (file)
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -7,8 +7,8 @@
 #ifndef _CTYPE_H
 #define _CTYPE_H
 
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 extern char    __ctype[];      /* property array defined in chartab.c */

diff --git a/include/err.h b/include/err.h
index e44709ba5d4095bad9226927f7cf702c3c9326ee..3e7a44e6db95f130e2e9b4e11fb7c77234048fee 100644 (file)
--- a/include/err.h
+++ b/include/err.h
@@ -42,7 +42,7 @@
  * _BSD_VA_LIST_ from <machine/ansi.h> and use it.
  */
 #ifdef __minix
-#include <ansi.h>
+#include <minix/ansi.h>
 #else
 #include <machine/ansi.h>
 #endif

diff --git a/include/lib.h b/include/lib.h
index d19736cb3f6bd7c2f18f1dc203e5b9ff15cb4f83..4b2f445033ce1f0185030a469271de7eacd71e13 100644 (file)
--- a/include/lib.h
+++ b/include/lib.h
@@ -14,7 +14,7 @@
 #include <minix/types.h>
 #include <limits.h>
 #include <errno.h>
-#include <ansi.h>
+#include <minix/ansi.h>
 
 #include <minix/const.h>
 #include <minix/com.h>

diff --git a/include/libgen.h b/include/libgen.h
index 5825e56efc5eeab459ac19a715919fc731b94729..8998923b1a9bf077280100c05d7d40719db0af78 100644 (file)
--- a/include/libgen.h
+++ b/include/libgen.h
@@ -2,7 +2,7 @@
 libgen.h
 */
 
-#include <ansi.h>
+#include <minix/ansi.h>
 
 /* Open Group Base Specifications Issue 6 (not complete) */
 _PROTOTYPE( char *basename, (char *_path)                              );

diff --git a/include/locale.h b/include/locale.h
index d06a2def0900c0eb6b40dacc4c2f3abf23c13980..8c06e5e0038fa3bef5bbff26a3897a76d37dc7b6 100644 (file)
--- a/include/locale.h
+++ b/include/locale.h
@@ -6,8 +6,8 @@
 #ifndef _LOCALE_H
 #define _LOCALE_H
 
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 struct lconv {

diff --git a/include/math.h b/include/math.h
index 1c3df22d400bffaa9063e45b230d11ee37f6d45f..766a8df4f9278a4933efd6ec6090ff262859e7b9 100644 (file)
--- a/include/math.h
+++ b/include/math.h
@@ -3,8 +3,8 @@
 #ifndef _MATH_H
 #define _MATH_H
 
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 #define INFINITY       (__infinity())

diff --git a/include/minix/a.out.h b/include/minix/a.out.h
index b54f7a8cccdee6b8d06d86c18c28ac5ae1b2ef66..5e66faca64932edac4e364526de0f54c88f8d19f 100644 (file)
--- a/include/minix/a.out.h
+++ b/include/minix/a.out.h
@@ -109,8 +109,8 @@ struct nlist {                      /* symbol table entry */
 #define C_STAT         0030    /* static */
 
 /* Function prototypes. */
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 _PROTOTYPE( int nlist, (char *_file, struct nlist *_nl)                        );

diff --git a/include/ansi.h b/include/minix/ansi.h
similarity index 93%
rename from include/ansi.h
rename to include/minix/ansi.h
index 34f7c1559ab1ffa778919679c8ab99fa482bab80..7ff8e78555f0822ac3661b4813155d5419ac760b 100644 (file)
--- a/include/ansi.h
+++ b/include/minix/ansi.h
@@ -1,4 +1,4 @@
-/* The <ansi.h> header attempts to decide whether the compiler has enough
+/* The <minix/ansi.h> header attempts to decide whether the compiler has enough
  * conformance to Standard C for Minix to take advantage of.  If so, the
  * symbol _ANSI is defined (as 31459).  Otherwise _ANSI is not defined
  * here, but it may be defined by applications that want to bend the rules.
@@ -18,8 +18,8 @@
  * The appropriate macros are defined here.
  */
 
-#ifndef _ANSI_H
-#define _ANSI_H
+#ifndef _MINIX_ANSI_H
+#define _MINIX_ANSI_H
 
 #if __STDC__ == 1
 #define _ANSI          31459   /* compiler claims full ANSI conformance */
@@ -73,4 +73,4 @@
 #include <stdarg.h>
 #define _BSD_VA_LIST_ va_list
 
-#endif /* ANSI_H */
+#endif /* _MINIX_ANSI_H */

diff --git a/include/minix/driver.h b/include/minix/driver.h
index 728818f4a38228b5c16c6dba027dd97cb2851800..aa48ba3733e0ce1d4e5d0eff2802af3b8398b01d 100644 (file)
--- a/include/minix/driver.h
+++ b/include/minix/driver.h
@@ -11,7 +11,7 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* MUST be first */
-#include <ansi.h>              /* MUST be second */
+#include <minix/ansi.h>                /* MUST be second */
 #include <minix/type.h>
 #include <minix/ipc.h>
 #include <minix/com.h>

diff --git a/include/minix/drivers.h b/include/minix/drivers.h
index 2d1e49702bceb08ce6a267ff90bba83e7a300048..776f3c8e2003d5dbfa978de53a7f2fee79648446 100644 (file)
--- a/include/minix/drivers.h
+++ b/include/minix/drivers.h
@@ -11,7 +11,7 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* MUST be first */
-#include <ansi.h>              /* MUST be second */
+#include <minix/ansi.h>                /* MUST be second */
 #include <minix/type.h>
 #include <minix/com.h>
 #include <minix/dmap.h>

diff --git a/include/minix/minlib.h b/include/minix/minlib.h
index faf69353e8f6abb99797ec1d4870a85b7989edcd..aea58b96f940b679fee6e5eb7fa789b1bf81f74f 100644 (file)
--- a/include/minix/minlib.h
+++ b/include/minix/minlib.h
@@ -1,8 +1,8 @@
 #ifndef _MINLIB
 #define _MINLIB
 
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 /* Miscellaneous BSD. */

diff --git a/include/minix/mthread.h b/include/minix/mthread.h
index 7549515d4a271ab6f0e7845c680905237cacffd1..9adcf59ab428dcd3a74d49d6795781cc450f7458 100644 (file)
--- a/include/minix/mthread.h
+++ b/include/minix/mthread.h
@@ -2,7 +2,7 @@
 #define _MTHREAD_H
 
 #include <minix/config.h>      /* MUST be first */
-#include <ansi.h>              /* MUST be second */
+#include <minix/ansi.h>                /* MUST be second */
 #include <minix/const.h>
 #include <sys/types.h>
 #include <stdio.h>

diff --git a/include/minix/profile.h b/include/minix/profile.h
index 74de601ef1879227405c7e7a5f063d2107bf2b2c..8563eafe2a687d42bb1baa16313a1d0798f5c24e 100644 (file)
--- a/include/minix/profile.h
+++ b/include/minix/profile.h
@@ -1,7 +1,7 @@
 #ifndef _PROFILE_H
 #define _PROFILE_H
 
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <minix/type.h>
 
 /*

diff --git a/include/minix/queryparam.h b/include/minix/queryparam.h
index 7415fab4393023237c2e32c65ce24b65ce2591e8..a3639c2856a6214f277957b254c9854e1a5d23b1 100644 (file)
--- a/include/minix/queryparam.h
+++ b/include/minix/queryparam.h
@@ -4,7 +4,7 @@
 #ifndef _MINIX__QUERYPARAM_H
 #define _MINIX__QUERYPARAM_H
 
-#include <ansi.h>
+#include <minix/ansi.h>
 
 typedef size_t _mnx_size_t;
 

diff --git a/include/minix/types.h b/include/minix/types.h
index f98ac6e16914eb3b324abc349485756872b029d0..9bb2aa1935ca2d39457c56242385cbaf7c56651c 100644 (file)
--- a/include/minix/types.h
+++ b/include/minix/types.h
@@ -7,8 +7,8 @@
 #ifndef _TYPES_H
 #define _TYPES_H
 
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 typedef unsigned char   u8_t;     /* 8 bit type */

diff --git a/include/net/netlib.h b/include/net/netlib.h
index fd6eade570e8a89f058ea5faa5e9a86ceb6ab37a..447c943a8240e3b45d372f0983956081df3f39f7 100644 (file)
--- a/include/net/netlib.h
+++ b/include/net/netlib.h
@@ -6,7 +6,7 @@ net/netlib.h
 #define _NET__NETLIB_H_
 
 #ifndef _ANSI
-#include <ansi.h>
+#include <minix/ansi.h>
 #endif
 
 _PROTOTYPE (int iruserok, (unsigned long raddr, int superuser,

diff --git a/include/regexp.h b/include/regexp.h
index 31d92532971a95d9b74307158ecc728dccbb0dc5..c94d6306a28b6c18774d20838ab8d09c9aaa44fd 100644 (file)
--- a/include/regexp.h
+++ b/include/regexp.h
@@ -4,8 +4,8 @@
 #ifndef _REGEXP_H
 #define _REGEXP_H
 
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 #define CHARBITS 0377

diff --git a/include/setjmp.h b/include/setjmp.h
index 1417bcd30bc23038bfce419f735ab44ceb1cb994..f1a9285320f48f1ecc73c8b2a57b15298206f9b0 100644 (file)
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -51,8 +51,8 @@
 #ifndef _SETJMP_H
 #define _SETJMP_H
 
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 typedef struct {

diff --git a/include/signal.h b/include/signal.h
index 141bb54c6c3c00fc31bcd9b4caac813a2bd9674e..218be8caed86887073bfcd78bea524480c21b957 100644 (file)
--- a/include/signal.h
+++ b/include/signal.h
@@ -6,8 +6,8 @@
 #ifndef _SIGNAL_H
 #define _SIGNAL_H
 
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 #ifdef _POSIX_SOURCE
 #ifndef _TYPES_H

diff --git a/include/stdio.h b/include/stdio.h
index bef6c6cec17e953fd18a8993d1d6b2a8375acaf6..f8e355d77204eae1dd8bfe75101e299f67ceb46b 100644 (file)
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -9,8 +9,8 @@
 #ifndef _STDIO_H
 #define        _STDIO_H
 
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 #include <sys/null.h>   /* For NULL */

diff --git a/include/stdlib.h b/include/stdlib.h
index 8b53a0b2dfc03ccd9db5b15f24c849a01843775e..72c9dad4c86cd2d23b9c45c03d7016c2cbbc68bd 100644 (file)
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -3,8 +3,8 @@
 #ifndef _STDLIB_H
 #define _STDLIB_H
 
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 #include <stddef.h>

diff --git a/include/string.h b/include/string.h
index 4d27b3481f0a6a764b2abbc1a6c117fb9760ff10..a29f77abdec07f82ea2f117e7dd3b2a72293c5c8 100644 (file)
--- a/include/string.h
+++ b/include/string.h
@@ -18,8 +18,8 @@ typedef unsigned int size_t;  /* type returned by sizeof */
 #endif /*_SIZE_T */
 
 /* Function Prototypes. */
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 _PROTOTYPE( void *memchr, (const void *_s, int _c, size_t _n)          );

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

diff --git a/include/sys/mount.h b/include/sys/mount.h
index 8ae914176e09fca641860363d9eadd439580bbd7..883833a4893582d275e18110a64f8e8fb2c14124 100644 (file)
--- a/include/sys/mount.h
+++ b/include/sys/mount.h
@@ -12,8 +12,8 @@
 
 
 /* Function Prototypes. */
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 _PROTOTYPE( int mount, (char *_spec, char *_name, int _mountflags,

diff --git a/include/sys/ptrace.h b/include/sys/ptrace.h
index 7299db9f234b9180eaae8bca4c43da263a16404f..ddd17dc82749ae9471be9ae4c7564050f416585a 100644 (file)
--- a/include/sys/ptrace.h
+++ b/include/sys/ptrace.h
@@ -49,8 +49,8 @@ struct ptrace_range {
 };
 
 /* Function Prototypes. */
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 _PROTOTYPE( long ptrace, (int _req, pid_t _pid, long _addr, long _data) );

diff --git a/include/sys/sigcontext.h b/include/sys/sigcontext.h
index abac04aec21e83996046fae5e3f13d4d93997988..c7e6f0cffa74ae4d446bf11051e46f34ba887105 100644 (file)
--- a/include/sys/sigcontext.h
+++ b/include/sys/sigcontext.h
@@ -6,8 +6,8 @@
  * by the signal catching mechanism.
  */
 
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 #ifndef _MINIX_SYS_CONFIG_H

diff --git a/include/sys/time.h b/include/sys/time.h
index 00bb13235f353be3806428a3c411bfcf55a26d58..b4feedde03f0cc92828d94b91e13785705a15ede 100644 (file)
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -5,7 +5,7 @@ sys/time.h
 #ifndef _SYS__TIME_H
 #define _SYS__TIME_H
 
-#include <ansi.h>
+#include <minix/ansi.h>
 
 /* Open Group Base Specifications Issue 6 (not complete) */
 struct timeval

diff --git a/include/sys/times.h b/include/sys/times.h
index 76862a1bd773aa06a32e35a1c9d2ee2d1c953da7..2966d1aa28ca2177942103c07bf76d9d539a82ad 100644 (file)
--- a/include/sys/times.h
+++ b/include/sys/times.h
@@ -16,8 +16,8 @@ struct tms {
 };
 
 /* Function Prototypes. */
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 _PROTOTYPE( clock_t times, (struct tms *_buffer)                       );

diff --git a/include/sys/utsname.h b/include/sys/utsname.h
index ca4085dbbe193db69c7cb37036bb417403a51c05..da0f70a1284dd333194048bb755e8dc257fca833 100644 (file)
--- a/include/sys/utsname.h
+++ b/include/sys/utsname.h
@@ -3,10 +3,12 @@
 #ifndef _UTSNAME_H
 #define _UTSNAME_H
 
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
+#include <minix/types.h>
+
 struct utsname {
   char sysname[15+1];
   char nodename[255+1];

diff --git a/include/termcap.h b/include/termcap.h
index 9f9495ce4b98ae1e7057c54a6a9ea8b818a3a12d..5dfc50ff37295bcfc7ce2f87919a767f920ca93d 100644 (file)
--- a/include/termcap.h
+++ b/include/termcap.h
@@ -1,7 +1,7 @@
 #ifndef _TERMCAP_H
 #define _TERMCAP_H
 
-#include <ansi.h>
+#include <minix/ansi.h>
 
 _PROTOTYPE( int tgetent, (char *_bp, char *_name)                      );
 _PROTOTYPE( int tgetflag, (char *_id)                                  );

diff --git a/include/termios.h b/include/termios.h
index ca83dca75a9dad0fad2726bdcb1f8fc13e5dc29f..d194fc39f603bc28392793416bd3f0e4218fb302 100644 (file)
--- a/include/termios.h
+++ b/include/termios.h
@@ -117,8 +117,8 @@ struct termios {
 #define TCION              4   /* transmit a START character on the line */
 
 /* Function Prototypes. */
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 _PROTOTYPE( int tcsendbreak, (int _fildes, int _duration)                   );

diff --git a/include/time.h b/include/time.h
index 75fa93b0cd8f8820571886a2878f9092c4aeda59..ede1baf2bcfbc9b48566bf2786ac17b13fe2c08b 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -47,8 +47,8 @@ struct tm {
 extern char *tzname[];
 
 /* Function Prototypes. */
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 _PROTOTYPE( clock_t clock, (void)                                      );

diff --git a/include/ttyent.h b/include/ttyent.h
index 9f739ba5d36bde9840cc85c3e627538e970fb6b8..ece4daa64d67520479762da75a8d7b5bbf70999a 100644 (file)
--- a/include/ttyent.h
+++ b/include/ttyent.h
@@ -4,8 +4,8 @@
 #ifndef _TTYENT_H
 #define _TTYENT_H
 
-#ifndef _ANSI_H
-#include <ansi.h>
+#ifndef _MINIX_ANSI_H
+#include <minix/ansi.h>
 #endif
 
 struct ttyent {

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

diff --git a/include/wchar.h b/include/wchar.h
index 56bc15b91673146f9398eb3ae1d5a90b7491ce04..e7d7da1107e3d4d6cca250f7f64536ac08fa2384 100644 (file)
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -56,7 +56,7 @@
 #ifndef _WCHAR_H_
 #define _WCHAR_H_
 
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <stdarg.h>
 #include <stddef.h>
 

diff --git a/include/wctype.h b/include/wctype.h
index b5b78be4b6ce5ef818367022c88d3423118f4733..810c45be9acd5a214e81e3d4323447259d2f4480 100644 (file)
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -29,7 +29,7 @@
 #ifndef _WCTYPE_H_
 #define        _WCTYPE_H_
 
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <stddef.h>
 #include <wchar.h>
 

diff --git a/kernel/debug.h b/kernel/debug.h
index d0a830290382b87cfc49537cb637fee6ce4c2c25..c63755a5e14372041858774e9e63e934950e5353 100644 (file)
--- a/kernel/debug.h
+++ b/kernel/debug.h
@@ -8,7 +8,7 @@
  */
 
 #ifndef __ASSEMBLY__
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <minix/debug.h>
 #include "config.h"
 #endif

diff --git a/kernel/kernel.h b/kernel/kernel.h
index ff80d1d4a2f39548f96ddf92fde6def78852b1f5..0e1e621927636712e58b329b3e3f0a91f94bfa40 100644 (file)
--- a/kernel/kernel.h
+++ b/kernel/kernel.h
@@ -35,7 +35,7 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* global configuration, MUST be first */
-#include <ansi.h>              /* C style: ANSI or K&R, MUST be second */
+#include <minix/ansi.h>                /* C style: ANSI or K&R, MUST be second */
 #include <sys/types.h>         /* general system types */
 #include <minix/const.h>       /* MINIX specific constants */
 #include <minix/type.h>                /* MINIX specific types, e.g. message */

diff --git a/lib/libc/ip/getproto.c b/lib/libc/ip/getproto.c
index 9d84b13dce0e6cfbad8261bf9d7343e87c402cb6..7ceea4770ec0bdce3965a6863035a959d6136668 100644 (file)
--- a/lib/libc/ip/getproto.c
+++ b/lib/libc/ip/getproto.c
@@ -24,7 +24,7 @@ static char sccsid[] = "@(#)getproto.c        5.6 (Berkeley) 6/1/90";
 #include <stddef.h>
 
 #ifdef _MINIX
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <net/gen/netdb.h>
 #endif
 

diff --git a/lib/libc/ip/strcasecmp.c b/lib/libc/ip/strcasecmp.c
index 0e6605614de7ad680ab2790e0a919c911bd5cc22..b6a954d0dbc467123b2ef8abed1f33867a0a6af9 100644 (file)
--- a/lib/libc/ip/strcasecmp.c
+++ b/lib/libc/ip/strcasecmp.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/types.h>
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <strings.h>
 #include <ctype.h>
 

diff --git a/lib/libc/other/fslib.c b/lib/libc/other/fslib.c
index a24c886ce8c50ef9db7f8ae1eccbfcea1cbacd73..bcbcd24c5b1f48c7320ce6f77ce62372d2061282 100644 (file)
--- a/lib/libc/other/fslib.c
+++ b/lib/libc/other/fslib.c
@@ -1,7 +1,7 @@
 /* fslib.c - routines needed by fs and fs utilities */
 
 #include <minix/config.h>      /* for unused stuff in <minix/type.h> :-( */
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <limits.h>
 #include <dirent.h>
 #include <sys/types.h>

diff --git a/lib/libc/other/memccpy.c b/lib/libc/other/memccpy.c
index 59ddb711d8be7fe85989417d7f94cee79d189200..1991d8170ebf1dae452231e83760e7690004b96b 100644 (file)
--- a/lib/libc/other/memccpy.c
+++ b/lib/libc/other/memccpy.c
@@ -5,7 +5,7 @@
  * It should be a mask, e.g. 0377 for an 8-bit machine.
  */
 
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <stddef.h>
 
 _PROTOTYPE( void *memccpy, (void *dst, const void *src,

diff --git a/lib/libc/stdio/loc_incl.h b/lib/libc/stdio/loc_incl.h
index 1578003108b7bc34306f403476adbbfb1748ab2d..49b593b8be6cb6d8802a92cbbd437cfaf3033214 100644 (file)
--- a/lib/libc/stdio/loc_incl.h
+++ b/lib/libc/stdio/loc_incl.h
@@ -4,7 +4,7 @@
 /* $Header$ */
 
 #include       <stdio.h>
-#include       <ansi.h>
+#include       <minix/ansi.h>
 
 #define        io_testflag(p,x)        ((p)->_flags & (x))
 

diff --git a/lib/libdriver/mq.c b/lib/libdriver/mq.c
index a80900d835f6e7603ba2423b6e446d9f1ce0d2a2..9512803ffa51767a0a1c76e297b7ee754f8e53c4 100644 (file)
--- a/lib/libdriver/mq.c
+++ b/lib/libdriver/mq.c
@@ -6,7 +6,7 @@ Created:        Jan 3, 1992 by Philip Homburg
 Copyright 1995 Philip Homburg
 */
 
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <assert.h>
 
 #include <minix/config.h>

diff --git a/lib/libsys/asynsend.c b/lib/libsys/asynsend.c
index 2a06f7d617ce8ce81497ea644ca9357eeda3853d..8c2c749749fe18c31ae042dd90ecf722c4605cc2 100644 (file)
--- a/lib/libsys/asynsend.c
+++ b/lib/libsys/asynsend.c
@@ -3,7 +3,7 @@
 #define _SYSTEM 1
 
 #include <minix/config.h>
-#include <ansi.h> 
+#include <minix/ansi.h> 
 #include <assert.h> 
 #include <sys/types.h>
 #include <minix/const.h>

diff --git a/lib/libvtreefs/inc.h b/lib/libvtreefs/inc.h
index 41e6883bd392e6b536ad5cca75a31431307e490b..2d9c6547740ba8dbe43b2ca98edfa160dbf4ffb5 100644 (file)
--- a/lib/libvtreefs/inc.h
+++ b/lib/libvtreefs/inc.h
@@ -3,7 +3,7 @@
 #define _MINIX             1   /* tell headers to include MINIX stuff */
 #define _SYSTEM            1   /* tell headers that this is the kernel */
 
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/servers/ds/inc.h b/servers/ds/inc.h
index 66f282415471bd07626c7658cb1f4baf05aa9b30..c9b16f2fc035aaa69a5c6338f1ff73d2c9ee831d 100644 (file)
--- a/servers/ds/inc.h
+++ b/servers/ds/inc.h
@@ -7,7 +7,7 @@
 #define _MINIX             1   /* tell headers to include MINIX stuff */
 #define _SYSTEM            1    /* get OK and negative error codes */
 
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <limits.h>

diff --git a/servers/ext2/fs.h b/servers/ext2/fs.h
index 36c1d65c88f7c8af546cf6b29324e45065e641c8..0a1b794fc8a109242a7ac77055627858a691ec85 100644 (file)
--- a/servers/ext2/fs.h
+++ b/servers/ext2/fs.h
@@ -13,7 +13,7 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* MUST be first */
-#include <ansi.h>              /* MUST be second */
+#include <minix/ansi.h>                /* MUST be second */
 #include <sys/types.h>
 #include <minix/const.h>
 #include <minix/type.h>

diff --git a/servers/inet/queryparam.h b/servers/inet/queryparam.h
index 7415fab4393023237c2e32c65ce24b65ce2591e8..a3639c2856a6214f277957b254c9854e1a5d23b1 100644 (file)
--- a/servers/inet/queryparam.h
+++ b/servers/inet/queryparam.h
@@ -4,7 +4,7 @@
 #ifndef _MINIX__QUERYPARAM_H
 #define _MINIX__QUERYPARAM_H
 
-#include <ansi.h>
+#include <minix/ansi.h>
 
 typedef size_t _mnx_size_t;
 

diff --git a/servers/is/inc.h b/servers/is/inc.h
index 11e397f5b3d6746c722aef21729d01f93af16d2e..10b2772d729140ed3e2956cd4ceb434d00e1e382 100644 (file)
--- a/servers/is/inc.h
+++ b/servers/is/inc.h
@@ -7,7 +7,7 @@
 #define _SYSTEM            1    /* get OK and negative error codes */
 #define _MINIX             1   /* tell headers to include MINIX stuff */
 
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <sys/types.h>
 #include <limits.h>
 #include <errno.h>

diff --git a/servers/iso9660fs/inc.h b/servers/iso9660fs/inc.h
index 26d99a82b5af4796d25f50db6e92c0e36ff79696..1072bf2e01d69134267c109650e65b3cfd8ae877 100644 (file)
--- a/servers/iso9660fs/inc.h
+++ b/servers/iso9660fs/inc.h
@@ -4,7 +4,7 @@
 
 #define VERBOSE                   0    /* display diagnostics */
 
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <sys/types.h>
 #include <limits.h>
 #include <errno.h>

diff --git a/servers/mfs/fs.h b/servers/mfs/fs.h
index fe613378ae1561ef6796c07a2c2928e3935bdd1b..d716d5dfd9acb30ef88ffa2802ca483cec8e7825 100644 (file)
--- a/servers/mfs/fs.h
+++ b/servers/mfs/fs.h
@@ -12,7 +12,7 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* MUST be first */
-#include <ansi.h>              /* MUST be second */
+#include <minix/ansi.h>                /* MUST be second */
 #include <sys/types.h>
 #include <minix/const.h>
 #include <minix/type.h>

diff --git a/servers/pfs/fs.h b/servers/pfs/fs.h
index 225cd35acd4f968fd3205e745aa34b218ba6e673..2bc006af367d603f09dcb94f6ccd2917c09f86e6 100644 (file)
--- a/servers/pfs/fs.h
+++ b/servers/pfs/fs.h
@@ -10,7 +10,7 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* MUST be first */
-#include <ansi.h>              /* MUST be second */
+#include <minix/ansi.h>                /* MUST be second */
 #include <sys/types.h>
 #include <minix/const.h>
 #include <minix/type.h>

diff --git a/servers/pfs/inc.h b/servers/pfs/inc.h
index 93c1edde7b62db8250f5359751951217b62993aa..0bba827f6945bf9192baaeb833a284f6d79d183b 100644 (file)
--- a/servers/pfs/inc.h
+++ b/servers/pfs/inc.h
@@ -6,7 +6,7 @@
 
 #include <net/ioctl.h>
 
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/select.h>

diff --git a/servers/pm/pm.h b/servers/pm/pm.h
index 579757e635e4b26c9283a7fe8e25b2ebf49f2619..d18ecbf33d75a350611a79eb2232ed0e54c98014 100644 (file)
--- a/servers/pm/pm.h
+++ b/servers/pm/pm.h
@@ -7,7 +7,7 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* MUST be first */
-#include <ansi.h>              /* MUST be second */
+#include <minix/ansi.h>                /* MUST be second */
 #include <sys/types.h>
 #include <minix/const.h>
 #include <minix/type.h>

diff --git a/servers/procfs/inc.h b/servers/procfs/inc.h
index 4773f588968c1069100bd51079c2bf00cee3231a..1a51668ea0b73cec72d3737eaf785ac2a660ce7f 100644 (file)
--- a/servers/procfs/inc.h
+++ b/servers/procfs/inc.h
@@ -6,7 +6,7 @@
 #define _SYSTEM            1
 
 #include <minix/config.h>
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <limits.h>
 #include <errno.h>
 #include <signal.h>

diff --git a/servers/rs/inc.h b/servers/rs/inc.h
index 70bd8b7fc11150ce6f0495781077c9048148738c..edfd3d11400f9fef8510992bd4f394b7b04bef70 100644 (file)
--- a/servers/rs/inc.h
+++ b/servers/rs/inc.h
@@ -7,7 +7,7 @@
 #define _SYSTEM            1    /* get OK and negative error codes */
 #define _MINIX             1   /* tell headers to include MINIX stuff */
 
-#include <ansi.h>
+#include <minix/ansi.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>

diff --git a/servers/sched/sched.h b/servers/sched/sched.h
index edd85aeed6ba2fc8e035c8f6b628f633ec1b1e28..f5678ff750ff18e427bf12807b9eb5b73e18bdee 100644 (file)
--- a/servers/sched/sched.h
+++ b/servers/sched/sched.h
@@ -7,7 +7,7 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* MUST be first */
-#include <ansi.h>              /* MUST be second */
+#include <minix/ansi.h>                /* MUST be second */
 #include <sys/types.h>
 #include <minix/const.h>
 

diff --git a/servers/vfs/fs.h b/servers/vfs/fs.h
index 98bda57798a7740afab2e65a8b813fc151eeade6..216225de95f98f5e99f49b4e69a457177b8d04cd 100644 (file)
--- a/servers/vfs/fs.h
+++ b/servers/vfs/fs.h
@@ -21,7 +21,7 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* MUST be first */
-#include <ansi.h>              /* MUST be second */
+#include <minix/ansi.h>                /* MUST be second */
 #include <sys/types.h>
 #include <minix/const.h>
 #include <minix/type.h>