retire _ANSI and <minix/ansi.h>

diff --git a/commands/cawf/bsfilt.c b/commands/cawf/bsfilt.c
index 39858cccad99b858e2e0a134b7c1513e584a3b3d..214efda33fdb7d955b3cd73fbb9e86f0e3f26367 100644 (file)
--- a/commands/cawf/bsfilt.c
+++ b/commands/cawf/bsfilt.c
@@ -42,7 +42,6 @@
 
 #include <sys/types.h>
 
-#include <minix/ansi.h>
 
 #define MAXLL  2048                    /* ridiculous maximum line length */
 

diff --git a/commands/cawf/proto.h b/commands/cawf/proto.h
index 34df3be28d649ef726ddfedaccc24be26739b064..6b1a5cc409059a3cac4732fcac36d8f760fbe24e 100644 (file)
--- a/commands/cawf/proto.h
+++ b/commands/cawf/proto.h
@@ -28,7 +28,6 @@
  *     4. This notice may not be removed or altered.
  */
 
-#include <minix/ansi.h>
 
 #ifdef UNIX
 # ifdef        USG

diff --git a/commands/elvis/curses.c b/commands/elvis/curses.c
index fcfc7d8c515fc2cef91233b23eeb53aa5e6dd8e5..f8cc76742a3b0fa6467653448187458297e951df 100644 (file)
--- a/commands/elvis/curses.c
+++ b/commands/elvis/curses.c
@@ -383,11 +383,7 @@ void resume_curses(quietly)
        }       
        exwrote = FALSE;
 
-#if TURBOC || __GNUC__ || _ANSI
        signal(SIGINT, (void(*)()) trapint);
-#else
-       signal(SIGINT, trapint);
-#endif
 }
 
 /* This function fetches an optional string from termcap */

diff --git a/commands/elvis/main.c b/commands/elvis/main.c
index 269d35196a653000fd02c0e709add50924af0270..0198b8be4761dd2597f161f6123bb3a43d36486f 100644 (file)
--- a/commands/elvis/main.c
+++ b/commands/elvis/main.c
@@ -434,11 +434,7 @@ int trapint(signo)
 #if OSK
        sigmask(-1);
 #endif
-#if TURBOC || __GNUC__ || _ANSI
        signal(signo, (void (*)())trapint);
-#else
-       signal(signo, trapint);
-#endif
        doingglobal = FALSE;
 
        longjmp(jmpenv, 1);

diff --git a/commands/elvis/system.c b/commands/elvis/system.c
index 676d788c1c8292de381d6b0c09ea8fae4f0f27c6..e73bc5a922f3664d77982c3564ea4e8078eea4d7 100644 (file)
--- a/commands/elvis/system.c
+++ b/commands/elvis/system.c
@@ -73,11 +73,7 @@ int system(cmd)
                {
                        status = -1;
                }
-#if __GNUC__ || _ANSI
                signal(SIGINT, (void (*)()) trapint);
-#else
-               signal(SIGINT, trapint);
-#endif
        }
 
        return status;
@@ -168,11 +164,7 @@ int rpclose(fd)
 
        close(fd);
        wait(&status);
-#if __GNUC__ || _ANSI
        signal(SIGINT, (void (*)()) trapint);
-#else
-       signal(SIGINT, trapint);
-#endif
        return status;
 }
 

diff --git a/commands/elvis/unix.c b/commands/elvis/unix.c
index cf101261d5f6e421a8181a49f0e7924b1dc56882..f366d2673a9114af48ae8205538f560db520203b 100644 (file)
--- a/commands/elvis/unix.c
+++ b/commands/elvis/unix.c
@@ -189,11 +189,7 @@ int ttyread(buf, len, time)
        int     time;   /* maximum time to allow for reading */
 {
        /* arrange for timeout */
-#if __GNUC__ || _ANSI
        signal(SIGALRM, (void (*)()) dummy);
-#else
-       signal(SIGALRM, dummy);
-#endif
        alarm(time);
 
        /* perform the blocking read */
@@ -207,11 +203,7 @@ int ttyread(buf, len, time)
        }
 
        /* cancel the alarm */
-#if _ANSI
        signal(SIGALRM, (void (*)())dummy); /* work around a bug in Minix */
-#else
-       signal(SIGALRM, dummy);             /* work around a bug in Minix */
-#endif
        alarm(0);
 
        /* return the number of bytes read */

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

diff --git a/commands/stty/stty.c b/commands/stty/stty.c
index f97db69f1de9c27a657bc8c005877213ac298673..309cbc5becccac2ba09f8fe8045266019bdcd98f 100644 (file)
--- a/commands/stty/stty.c
+++ b/commands/stty/stty.c
@@ -92,11 +92,7 @@ int column= 0, max_column=80;                /* Assume 80 character terminals. */
 struct winsize winsize;
 #endif
 
-#if __minix
-#define PROTO(a) _ARGS(a)
-#else
-#define PROTO(a) ()
-#endif
+#define PROTO(a) a
 
 int main PROTO(( int argc, char **argv ));
 void report PROTO(( int flags ));

diff --git a/common/include/sys/mount.h b/common/include/sys/mount.h
index 444a985687bb8f718fb1d5ffe893d50d5c984de2..606fff1e93ba350793e3423882992ee9f280a1e0 100644 (file)
--- a/common/include/sys/mount.h
+++ b/common/include/sys/mount.h
@@ -10,12 +10,6 @@
 #define MS_LABEL16     0x004   /* Mount message points to 16-byte label */
 #define MS_EXISTING    0x008   /* Tell mount to use already running server */
 
-
-/* Function Prototypes. */
-#ifndef _MINIX_ANSI_H
-#include <minix/ansi.h>
-#endif
-
 int mount(char *_spec, char *_name, int _mountflags, char *type, char
        *args);
 int umount(const char *_name);

diff --git a/common/include/termios.h b/common/include/termios.h
index 1cff1a9bc1c69aa3b84775102ceaa0f1f0f06b5b..18ebd29f73af7380005608c8fca339d18d23d1c3 100644 (file)
--- a/common/include/termios.h
+++ b/common/include/termios.h
@@ -120,11 +120,6 @@ struct termios {
 #define TCIOFF             3   /* transmit a STOP character on the line */
 #define TCION              4   /* transmit a START character on the line */
 
-/* Function Prototypes. */
-#ifndef _MINIX_ANSI_H
-#include <minix/ansi.h>
-#endif
-
 int tcsendbreak(int _fildes, int _duration);
 int tcdrain(int _filedes);
 int tcflush(int _filedes, int _queue_selector);

diff --git a/include/Makefile.minix.inc b/include/Makefile.minix.inc
index 03d3cc2e1c726f8b0e4efb48fe9440cc965900f3..49a1dfcba0151889035a79700fd6143a5bced746 100644 (file)
--- a/include/Makefile.minix.inc
+++ b/include/Makefile.minix.inc
@@ -2,7 +2,7 @@
 
 INCS+=  env.h fetch.h lib.h libutil.h timers.h
 
-INCS+=         minix/acpi.h minix/ansi.h minix/audio_fw.h minix/bitmap.h \
+INCS+=         minix/acpi.h minix/audio_fw.h minix/bitmap.h \
        minix/bdev.h minix/blockdriver.h minix/blockdriver_mt.h \
        minix/btrace.h \
        minix/callnr.h minix/chardriver.h minix/com.h minix/compiler.h \

diff --git a/include/ddekit/ddekit.h b/include/ddekit/ddekit.h
index 300f831b25ca7cfe853510834e7da87d765e86ac..9535fe5d421778860388863cc04f379231228b9c 100644 (file)
--- a/include/ddekit/ddekit.h
+++ b/include/ddekit/ddekit.h
@@ -1,6 +1,5 @@
 #ifndef _DDEKIT_DDEKIT_H
 #define _DDEKIT_DDEKIT_H
-#include <minix/ansi.h>
 void ddekit_init(void);
 
 #endif

diff --git a/include/env.h b/include/env.h
index 34e84c71ad0d53ddb330833c4db20f947460abbe..2f6f64d77e32570cb76eec06ece7883ebfbca663 100644 (file)
--- a/include/env.h
+++ b/include/env.h
@@ -1,5 +1,4 @@
 #ifdef __NBSD_LIBC
-#include <minix/ansi.h>
 #endif
 int env_parse(char *env, char *fmt, int field, long *param, long min,
        long max);

diff --git a/include/lib.h b/include/lib.h
index fc6fcd9142256c4d5dd65ab5f08452fb3c70ae16..9932a4f015b15d5b931514cbb69a3b0f2c3ad256 100644 (file)
--- a/include/lib.h
+++ b/include/lib.h
@@ -19,7 +19,6 @@
 #include <minix/types.h>
 #include <limits.h>
 #include <errno.h>
-#include <minix/ansi.h>
 
 #include <minix/const.h>
 #include <minix/com.h>

diff --git a/include/minix/ansi.h b/include/minix/ansi.h
deleted file mode 100644 (file)
index 5a88913..0000000
--- a/include/minix/ansi.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _MINIX_ANSI_H
-#define _MINIX_ANSI_H
-
-#if __STDC__ == 1
-#define _ANSI          31459   /* compiler claims full ANSI conformance */
-#endif
-
-#ifdef __GNUC__
-#define _ANSI          31459   /* gcc conforms enough even in non-ANSI mode */
-#endif
-
-/* Setting of _POSIX_SOURCE (or _NETBSD_SOURCE) in NBSD headers is 
- * done in <sys/featuretest.h> */
-#include <sys/featuretest.h>
-
-#endif /* _MINIX_ANSI_H */

diff --git a/include/minix/driver.h b/include/minix/driver.h
index 1b9602d11842f792760267da8cdcfccf2b77e4d8..411637bc84759db1d367053f22848bb1f3560046 100644 (file)
--- a/include/minix/driver.h
+++ b/include/minix/driver.h
@@ -9,7 +9,6 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* MUST be first */
-#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 776f3c8e2003d5dbfa978de53a7f2fee79648446..a2c6968c61fcac4498be8e996bf24dd749677fc2 100644 (file)
--- a/include/minix/drivers.h
+++ b/include/minix/drivers.h
@@ -11,7 +11,6 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* MUST be first */
-#include <minix/ansi.h>                /* MUST be second */
 #include <minix/type.h>
 #include <minix/com.h>
 #include <minix/dmap.h>

diff --git a/include/minix/ipc.h b/include/minix/ipc.h
index d67c4d2b513b505ed29778798676fece9d787d44..752bebe316ddf075a083379070966d5ef5d65cca 100644 (file)
--- a/include/minix/ipc.h
+++ b/include/minix/ipc.h
@@ -2,7 +2,6 @@
 #define _IPC_H
 
 #ifdef __NBSD_LIBC
-#include <minix/ansi.h>
 #endif
 #include <minix/ipcconst.h>
 #include <minix/type.h>

diff --git a/include/minix/minlib.h b/include/minix/minlib.h
index d2d5758da39f95d740a58be4f922c678e539ac09..1a65f8e1f770a45ff9eb1671345843cd768b93ce 100644 (file)
--- a/include/minix/minlib.h
+++ b/include/minix/minlib.h
@@ -1,10 +1,6 @@
 #ifndef _MINLIB
 #define _MINLIB
 
-#ifndef _MINIX_ANSI_H
-#include <minix/ansi.h>
-#endif
-
 /* Miscellaneous BSD. */
 char *itoa(int _n);
 #ifndef __NBSD_LIBC

diff --git a/include/minix/mthread.h b/include/minix/mthread.h
index b9f7d33c126b52c9195cb1238cdf0050656b877c..786557a09bdeb9c8ef5b55550e4134798acb9687 100644 (file)
--- a/include/minix/mthread.h
+++ b/include/minix/mthread.h
@@ -2,7 +2,6 @@
 #define _MTHREAD_H
 
 #include <minix/config.h>      /* MUST be first */
-#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 aad400537ee8ce9066c95e526fe95214332098c3..c84efc182da1ff8dc8b2903d166b2ba27d42d506 100644 (file)
--- a/include/minix/profile.h
+++ b/include/minix/profile.h
@@ -1,7 +1,6 @@
 #ifndef _PROFILE_H
 #define _PROFILE_H
 
-#include <minix/ansi.h>
 #include <minix/type.h>
 
 /*

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

diff --git a/include/minix/types.h b/include/minix/types.h
index 68c6b67886c08bc29939015f1477d1838d7324d0..b7e2c43c2c7b3fb9d8e03462802a9f732068e217 100644 (file)
--- a/include/minix/types.h
+++ b/include/minix/types.h
@@ -2,7 +2,6 @@
 #define _MINIX_TYPES_H_
 
 /* Dummy file used in legacy (and shared) minix includes. */
-#include <minix/ansi.h>
 #include <sys/types.h>
 #include <sys/sigtypes.h>
 

diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h
index 3dee9c6b0b4b61c564042880b673262131b9c768..d73762697a0aa9344753ac21b854af8a4b54a75f 100644 (file)
--- a/include/sys/cdefs.h
+++ b/include/sys/cdefs.h
@@ -484,7 +484,6 @@
 
 #ifdef _MINIX
 /* If compiling in Minix tree, Minix ANSI definitions are always useful. */
-#include <minix/ansi.h>
 #endif
 
 #endif /* !_SYS_CDEFS_H_ */

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

diff --git a/kernel/kernel.h b/kernel/kernel.h
index 73f375a4eb1a41b1fcaed5e1fb7c17a3617067b9..7a6a148d46e0032cca1dc30fba22c9de2b0eb102 100644 (file)
--- a/kernel/kernel.h
+++ b/kernel/kernel.h
@@ -26,7 +26,6 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* global configuration, MUST be first */
-#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/gen/minix/popen.c b/lib/libc/gen/minix/popen.c
index f6b52a9d44ec75c63acd210ceb015bc2db78e51f..3bd48fc46805cba83ec291daf05132ad1b51130a 100644 (file)
--- a/lib/libc/gen/minix/popen.c
+++ b/lib/libc/gen/minix/popen.c
@@ -4,7 +4,6 @@
 /* $Header$ */
 #include       <sys/cdefs.h>
 #include       "namespace.h"
-#include       <minix/ansi.h>
 
 #ifdef __weak_alias
 __weak_alias(popen, _popen)
@@ -26,7 +25,6 @@ typedef union wait wait_arg;
 typedef int wait_arg;
 #endif /* __BSD4_2 */
 
-#ifdef _ANSI
 int _close(int d);
 int _dup2(int oldd, int newd);         /* not present in System 5 */
 int _execl(const char *name, const char *_arg, ... );
@@ -34,7 +32,6 @@ pid_t _fork(void);
 int _pipe(int fildes[2]);
 pid_t _wait(wait_arg *status);
 void _exit(int status);
-#endif
 
 static int pids[OPEN_MAX];
 
@@ -84,13 +81,8 @@ FILE *stream;
        wait_arg status;
        int wret;
 
-#ifdef _ANSI
        void (*intsave)(int) = signal(SIGINT, SIG_IGN);
        void (*quitsave)(int) = signal(SIGQUIT, SIG_IGN);
-#else
-       void (*intsave)() = signal(SIGINT, SIG_IGN);
-       void (*quitsave)() = signal(SIGQUIT, SIG_IGN);
-#endif
        fclose(stream);
        while ((wret = _wait(&status)) != -1) {
                if (wret == pids[fd]) break;

diff --git a/lib/libc/sys-minix/accept.c b/lib/libc/sys-minix/accept.c
index 3903533080537a3e28fd9b3f37fb4e2be229f244..7e659884ec385d3cf89efa40ddbc2e098642ffb9 100644 (file)
--- a/lib/libc/sys-minix/accept.c
+++ b/lib/libc/sys-minix/accept.c
@@ -1,5 +1,4 @@
 #include <sys/cdefs.h>
-#include <minix/ansi.h>
 #include "namespace.h"
 
 #include <errno.h>

diff --git a/lib/libc/sys-minix/fcntl.c b/lib/libc/sys-minix/fcntl.c
index 31e1281f398718848b511201804684f39780bf6a..59c37a6528a5a6d78bfd95e0596aa10be506a904 100644 (file)
--- a/lib/libc/sys-minix/fcntl.c
+++ b/lib/libc/sys-minix/fcntl.c
@@ -9,13 +9,7 @@
 __weak_alias(fcntl, _fcntl)
 #endif
 
-#if _ANSI
 int fcntl(int fd, int cmd, ...)
-#else
-int fcntl(fd, cmd)
-int fd;
-int cmd;
-#endif
 {
   va_list argp;
   message m;

diff --git a/lib/libc/sys-minix/getpeername.c b/lib/libc/sys-minix/getpeername.c
index 295c28125efcf10a29f08616495960428035db71..20f6659f24dcc26d0768c0ff378ffc756c56f557 100644 (file)
--- a/lib/libc/sys-minix/getpeername.c
+++ b/lib/libc/sys-minix/getpeername.c
@@ -1,6 +1,5 @@
 #include <sys/cdefs.h>
 #include "namespace.h"
-#include <minix/ansi.h>
 
 #include <errno.h>
 #include <stdio.h>

diff --git a/lib/libc/sys-minix/getsockname.c b/lib/libc/sys-minix/getsockname.c
index cbc0574bdfddc64a5bf4492b9e5c5a9aad82f519..a2dce74e197a2bb29b622bfb3fb07da5852257e3 100644 (file)
--- a/lib/libc/sys-minix/getsockname.c
+++ b/lib/libc/sys-minix/getsockname.c
@@ -8,7 +8,6 @@
 
 #include <sys/cdefs.h>
 #include "namespace.h"
-#include <minix/ansi.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/lib/libc/sys-minix/getsockopt.c b/lib/libc/sys-minix/getsockopt.c
index e57d3423383c0fc26db0447dac5ea2ba8a36457f..09a6dff6434497f66586a19901c4cdb9f2e7db7f 100644 (file)
--- a/lib/libc/sys-minix/getsockopt.c
+++ b/lib/libc/sys-minix/getsockopt.c
@@ -1,5 +1,4 @@
 #include <sys/cdefs.h>
-#include <minix/ansi.h>
 #include "namespace.h"
 
 #include <assert.h>

diff --git a/lib/libc/sys-minix/minix_rs.c b/lib/libc/sys-minix/minix_rs.c
index 236c55d086e2ea90c4a903bbc2e7ae60f73276a0..6b3f3e9d2b55ea04123c1c5d9b449a234fdd46e0 100644 (file)
--- a/lib/libc/sys-minix/minix_rs.c
+++ b/lib/libc/sys-minix/minix_rs.c
@@ -2,7 +2,6 @@
 #define _SYSTEM        1
 #define _MINIX 1
 
-#include <minix/ansi.h>
 #include <minix/callnr.h>
 #include <minix/com.h>
 #include <minix/config.h>

diff --git a/lib/libc/sys-minix/open.c b/lib/libc/sys-minix/open.c
index cd62a0300face9c436a47598e2df4fcc03f047f8..47dd6247741245031abb7f5c3273ddaba616eacb 100644 (file)
--- a/lib/libc/sys-minix/open.c
+++ b/lib/libc/sys-minix/open.c
@@ -10,11 +10,7 @@
 __weak_alias(open, _open)
 #endif
 
-#if _ANSI
 int open(const char *name, int flags, ...)
-#else
-int open(const char *name, int flags)
-#endif
 {
   va_list argp;
   message m;

diff --git a/lib/libc/sys-minix/recvfrom.c b/lib/libc/sys-minix/recvfrom.c
index 393372b81b65dbedccbc3b50c2613504e8b61cc5..9b0cb41a6f322a22a50733684360b88c4eeecb6d 100644 (file)
--- a/lib/libc/sys-minix/recvfrom.c
+++ b/lib/libc/sys-minix/recvfrom.c
@@ -1,5 +1,4 @@
 #include <sys/cdefs.h>
-#include <minix/ansi.h>
 #include "namespace.h"
 
 #undef NDEBUG

diff --git a/lib/libcompat_minix/include/compat/a.out.h b/lib/libcompat_minix/include/compat/a.out.h
index a45645c08d932c7f0d5c697d791e1822181d0fed..e85927de6ad4404a93479c63e526a322aff1f080 100644 (file)
--- a/lib/libcompat_minix/include/compat/a.out.h
+++ b/lib/libcompat_minix/include/compat/a.out.h
@@ -108,11 +108,6 @@ struct nlist {                     /* symbol table entry */
 #define C_EXT          0020    /* external symbol */
 #define C_STAT         0030    /* static */
 
-/* Function prototypes. */
-#ifndef _MINIX_ANSI_H
-#include <minix/ansi.h>
-#endif
-
 int nlist(char *_file, struct nlist *_nl);
 
 #endif /* _AOUT_H */

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

diff --git a/lib/libpuffs/fs.h b/lib/libpuffs/fs.h
index 44c70a9e3a06fdf5ab01ea7769c79092d423097b..7c711d124fc69668d94a089ccbf41c4f66ab8db9 100644 (file)
--- a/lib/libpuffs/fs.h
+++ b/lib/libpuffs/fs.h
@@ -13,7 +13,6 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* MUST be first */
-#include <minix/ansi.h>                /* MUST be second */
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <minix/const.h>

diff --git a/lib/libsys/asynsend.c b/lib/libsys/asynsend.c
index f5f8957ce23afcb0444097b63702bdac8d03df7c..c1f4ea47ed301a5c89cdc4d017136fab5b438a70 100644 (file)
--- a/lib/libsys/asynsend.c
+++ b/lib/libsys/asynsend.c
@@ -2,7 +2,6 @@
 #define _SYSTEM 1
 
 #include <minix/config.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 ac477af9ce4a59267340c81ac78930c4e33985f0..89a98e8a056ffdf8e7dca7da1cfc0c28899b2b91 100644 (file)
--- a/lib/libvtreefs/inc.h
+++ b/lib/libvtreefs/inc.h
@@ -4,7 +4,6 @@
 #define _MINIX             1   /* tell headers to include MINIX stuff */
 #define _SYSTEM            1   /* tell headers that this is the kernel */
 
-#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 c9b16f2fc035aaa69a5c6338f1ff73d2c9ee831d..7ed2d76cb66ac9258ca0e57315e987a6e530ccc0 100644 (file)
--- a/servers/ds/inc.h
+++ b/servers/ds/inc.h
@@ -7,7 +7,6 @@
 #define _MINIX             1   /* tell headers to include MINIX stuff */
 #define _SYSTEM            1    /* get OK and negative error codes */
 
-#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 0a1b794fc8a109242a7ac77055627858a691ec85..068306594756ac70297857c810ff0dd3c11c4351 100644 (file)
--- a/servers/ext2/fs.h
+++ b/servers/ext2/fs.h
@@ -13,7 +13,6 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* MUST be first */
-#include <minix/ansi.h>                /* MUST be second */
 #include <sys/types.h>
 #include <minix/const.h>
 #include <minix/type.h>

diff --git a/servers/inet/inet.h b/servers/inet/inet.h
index 01fecb32846042ac4985a288bfde6c99bc83827c..2e1b92224db03f0ddf8690dda31e6c285e9f1941 100644 (file)
--- a/servers/inet/inet.h
+++ b/servers/inet/inet.h
@@ -94,12 +94,6 @@ void inet_panic(void) _NORETURN;
        do { if (((level) & DEBUG) && (condition)) \
                { where(); code; } } while(0)
 
-#if _ANSI
-#define ARGS(x) x
-#else /* _ANSI */
-#define ARGS(x) ()
-#endif /* _ANSI */
-
 extern int this_proc;
 extern char version[];
 

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

diff --git a/servers/is/inc.h b/servers/is/inc.h
index 10b2772d729140ed3e2956cd4ceb434d00e1e382..f0133dc74b04d1322dfea2ed746e916c8d015172 100644 (file)
--- a/servers/is/inc.h
+++ b/servers/is/inc.h
@@ -7,7 +7,6 @@
 #define _SYSTEM            1    /* get OK and negative error codes */
 #define _MINIX             1   /* tell headers to include MINIX stuff */
 
-#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 d7559d5f23f88aa877b493377070e3141742111f..602c5661617345450fe712ee1f8b7dfae1dc7651 100644 (file)
--- a/servers/iso9660fs/inc.h
+++ b/servers/iso9660fs/inc.h
@@ -4,7 +4,6 @@
 
 #define VERBOSE                   0    /* display diagnostics */
 
-#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 df905d111f6f6aa05ecc8cd9d05fd5ca28ac337b..caa2291b4e300c074b779009a3795547e7964a02 100644 (file)
--- a/servers/mfs/fs.h
+++ b/servers/mfs/fs.h
@@ -12,7 +12,6 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* MUST be first */
-#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 2bc006af367d603f09dcb94f6ccd2917c09f86e6..3eb79b50c173dd634f66bf211526f50409735da5 100644 (file)
--- a/servers/pfs/fs.h
+++ b/servers/pfs/fs.h
@@ -10,7 +10,6 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* MUST be first */
-#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 4484e8038a58335e115c16ff2aba036ebcd7324f..6a1fcaa6c80d2e1efe1ab249b715c98ab44cd146 100644 (file)
--- a/servers/pfs/inc.h
+++ b/servers/pfs/inc.h
@@ -10,7 +10,6 @@
 #include <net/ioctl.h>
 #endif
 
-#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 d18ecbf33d75a350611a79eb2232ed0e54c98014..5372bf7730068cc77179b07765288dc3abb1bccf 100644 (file)
--- a/servers/pm/pm.h
+++ b/servers/pm/pm.h
@@ -7,7 +7,6 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* MUST be first */
-#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 7a10ab5716ffc550cd1af330e20ee316272a2ffe..61408f082aea89e17f6a5522407aac59134510a6 100644 (file)
--- a/servers/procfs/inc.h
+++ b/servers/procfs/inc.h
@@ -6,7 +6,6 @@
 #define _SYSTEM            1
 
 #include <minix/config.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 5b5e345797f88dfb2c89e5ba1ee77be52ff05e63..6077f186867cc95156200bd0d2c473f2fb827d64 100644 (file)
--- a/servers/rs/inc.h
+++ b/servers/rs/inc.h
@@ -7,7 +7,6 @@
 #define _SYSTEM            1    /* get OK and negative error codes */
 #define _MINIX             1   /* tell headers to include MINIX stuff */
 
-#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 f5678ff750ff18e427bf12807b9eb5b73e18bdee..80a75a98f5e6469311cc0b7ddca2ca2e429b328b 100644 (file)
--- a/servers/sched/sched.h
+++ b/servers/sched/sched.h
@@ -7,7 +7,6 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* MUST be first */
-#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 9531c2207964ce308b30637e094bec1289c14966..d3fc953b338ad64abe55a00a38bde381096d406a 100644 (file)
--- a/servers/vfs/fs.h
+++ b/servers/vfs/fs.h
@@ -24,7 +24,6 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>      /* MUST be first */
-#include <minix/ansi.h>                /* MUST be second */
 #include <sys/types.h>
 #include <minix/const.h>
 #include <minix/type.h>

diff --git a/test/test38.c b/test/test38.c
index 9ed4b00630768fbfbda5a7bb3cdd27e07bee4a9f..ff1b558ce077b58bf28bf89819fa4a4d7d6d0e38 100644 (file)
--- a/test/test38.c
+++ b/test/test38.c
@@ -565,11 +565,7 @@ void test38c()
 #ifdef SIGACTION
   struct sigaction act, oact;
 #else
-#if _ANSI
   void (*oldfunc) (int);
-#else
-  void (*oldfunc) ();
-#endif
 #endif
 
   subtest = 3;