retire _ANSI and <minix/ansi.h>

commands/cawf/bsfilt.c

@@ -42,7 +42,6 @@
 
 #include <sys/types.h>
 
-#include <minix/ansi.h>
 
 #define MAXLL	2048			/* ridiculous maximum line length */
 

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

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 */

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);

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;
 }
 

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 */

commands/mdb/mdb.h

@@ -36,7 +36,6 @@
 
 
 #include <minix/config.h>
-#include <minix/ansi.h>
 #include <sys/types.h>
 
 #include <minix/const.h>

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 ));

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);

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);

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 \

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

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);

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>

include/minix/ansi.h

@@ -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 */

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>

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>

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>

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

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>

include/minix/profile.h

@@ -1,7 +1,6 @@
 #ifndef _PROFILE_H
 #define _PROFILE_H
 
-#include <minix/ansi.h>
 #include <minix/type.h>
 
 /*

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;
 

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>
 

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_ */

kernel/debug.h

@@ -8,7 +8,6 @@
  */
 
 #ifndef __ASSEMBLY__
-#include <minix/ansi.h>
 #include <minix/debug.h>
 #include "config.h"
 #endif

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 */

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;

lib/libc/sys-minix/accept.c

@@ -1,5 +1,4 @@
 #include <sys/cdefs.h>
-#include <minix/ansi.h>
 #include "namespace.h"
 
 #include <errno.h>

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;

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>

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>

lib/libc/sys-minix/getsockopt.c

@@ -1,5 +1,4 @@
 #include <sys/cdefs.h>
-#include <minix/ansi.h>
 #include "namespace.h"
 
 #include <assert.h>

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>

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;

lib/libc/sys-minix/recvfrom.c

@@ -1,5 +1,4 @@
 #include <sys/cdefs.h>
-#include <minix/ansi.h>
 #include "namespace.h"
 
 #undef NDEBUG

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 */

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>

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>

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>

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>

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>

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>

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[];
 

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;
 

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>

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>

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>

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>

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>

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>

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>

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>

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>
 

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>

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;