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

hkkuma3p · Jan 28, 2011 · dc1cc91 · dc1cc91
1 parent e912f6a
commit dc1cc91
Show file tree

Hide file tree

Showing 69 changed files with 99 additions and 97 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → include/minix/ansi.h b/include/ansi.h → 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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