* g2c.hin, libF77/d_cnjg.c, libF77/main.c, libF77/r_cnjg.c,

	libF77/s_cat.c, libF77/s_paus.c, libF77/s_rnge.c, libF77/setarg.c,
	libF77/setsig.c, libF77/signal1.h0, libI77/dfe.c, libI77/due.c,
	libI77/err.c, libI77/fio.h, libI77/fmt.c, libI77/iio.c,
	libI77/ilnw.c, libI77/lread.c, libI77/lwrite.c, libI77/rsfe.c,
	libI77/rsli.c, libI77/rsne.c, libI77/sfe.c, libI77/sue.c,
	libI77/util.c, libI77/wrtfmt.c, libI77/wsfe.c, libI77/wsle.c,
	libI77/xwsne.c, libU77/date_.c: Kill VOID, Void and Int.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54134 138bc75d-0d04-0410-961f-82ee72b054a4

9 files changed, 21 insertions, 32 deletions

diff --git a/libf2c/libF77/d_cnjg.c b/libf2c/libF77/d_cnjg.c
index b8027780fb7..36909ecab0d 100644
--- a/libf2c/libF77/d_cnjg.c
+++ b/libf2c/libF77/d_cnjg.c
@@ -1,6 +1,6 @@
 #include "f2c.h"
 
- VOID
+void
 d_cnjg(doublecomplex *r, doublecomplex *z)
 {
 	doublereal zi = z->i;
diff --git a/libf2c/libF77/main.c b/libf2c/libF77/main.c
index 131c06ca394..7bc76b063af 100644
--- a/libf2c/libF77/main.c
+++ b/libf2c/libF77/main.c
@@ -3,13 +3,8 @@
 #include <stdio.h>
 #include "signal1.h"
 
-#undef VOID
 #include <stdlib.h>
 
-#ifndef VOID
-#define VOID void
-#endif
-
 extern void f_exit(void);
 #ifndef NO_ONEXIT
 #define ONEXIT atexit
diff --git a/libf2c/libF77/r_cnjg.c b/libf2c/libF77/r_cnjg.c
index 3be7f6f9581..cb830a82b2a 100644
--- a/libf2c/libF77/r_cnjg.c
+++ b/libf2c/libF77/r_cnjg.c
@@ -1,6 +1,7 @@
 #include "f2c.h"
 
-VOID r_cnjg(complex *r, complex *z)
+void
+r_cnjg(complex *r, complex *z)
 {
 	real zi = z->i;
 	r->r = z->r;
diff --git a/libf2c/libF77/s_cat.c b/libf2c/libF77/s_cat.c
index 470a3dad337..d8c933329d2 100644
--- a/libf2c/libF77/s_cat.c
+++ b/libf2c/libF77/s_cat.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #endif /* NO_OVERWRITE */
 
- VOID
+void
 s_cat(char *lp, char *rpp[], ftnint rnp[], ftnint *np, ftnlen ll)
 {
 	ftnlen i, nc;
diff --git a/libf2c/libF77/s_paus.c b/libf2c/libF77/s_paus.c
index 0f1b1917ab3..34f48616324 100644
--- a/libf2c/libF77/s_paus.c
+++ b/libf2c/libF77/s_paus.c
@@ -3,23 +3,21 @@
 #define PAUSESIG 15
 
 #include "signal1.h"
-#define Void void
-#define Int int
 #undef abs
 #undef min
 #undef max
 #include <stdlib.h>
 extern int getpid(void), isatty(int), pause(void);
 
-extern VOID f_exit(Void);
+extern void f_exit(void);
 
- static VOID
+static void
 waitpause(Sigarg)
 {	Use_Sigarg;
 	return;
 	}
 
- static VOID
+static void
 s_1paus(FILE *fin)
 {
 	fprintf(stderr,
diff --git a/libf2c/libF77/s_rnge.c b/libf2c/libF77/s_rnge.c
index 833d3e1a449..c58430e0896 100644
--- a/libf2c/libF77/s_rnge.c
+++ b/libf2c/libF77/s_rnge.c
@@ -3,7 +3,7 @@
 
 /* called when a subscript is out of range */
 
-extern VOID sig_die(char*,int);
+extern void sig_die(char*,int);
 integer s_rnge(char *varn, ftnint offset, char *procn, ftnint line)
 {
 register int i;
diff --git a/libf2c/libF77/setarg.c b/libf2c/libF77/setarg.c
index 5d8eea6ae65..bd4d517f4d3 100644
--- a/libf2c/libF77/setarg.c
+++ b/libf2c/libF77/setarg.c
@@ -1,13 +1,8 @@
 /* Set up the global argc/argv info for use by getarg_, iargc_, and
    g77's inlined intrinsic equivalents.  */
 
-#undef VOID
 #include <stdlib.h>
 
-#ifndef VOID
-#define VOID void
-#endif
-
 int f__xargc;
 char **f__xargv;
 
diff --git a/libf2c/libF77/setsig.c b/libf2c/libF77/setsig.c
index 2ff6c06acd3..6be89afb2c3 100644
--- a/libf2c/libF77/setsig.c
+++ b/libf2c/libF77/setsig.c
@@ -9,31 +9,28 @@
 #endif
 #endif
 
-#undef VOID
 #include <stdlib.h>
 
-#ifndef VOID
-#define VOID void
-#endif
-
 extern void sig_die(char*, int);
-#define Int int
 
-static VOID sigfdie(Sigarg)
+static void
+sigfdie(Sigarg)
 {
 Use_Sigarg;
 sig_die("Floating Exception", 1);
 }
 
 
-static VOID sigidie(Sigarg)
+static void
+sigidie(Sigarg)
 {
 Use_Sigarg;
 sig_die("IOT Trap", 1);
 }
 
 #ifdef SIGQUIT
-static VOID sigqdie(Sigarg)
+static void
+sigqdie(Sigarg)
 {
 Use_Sigarg;
 sig_die("Quit signal", 1);
@@ -41,20 +38,23 @@ sig_die("Quit signal", 1);
 #endif
 
 
-static VOID sigindie(Sigarg)
+static void
+sigindie(Sigarg)
 {
 Use_Sigarg;
 sig_die("Interrupt", 0);
 }
 
-static VOID sigtdie(Sigarg)
+static void
+sigtdie(Sigarg)
 {
 Use_Sigarg;
 sig_die("Killed", 0);
 }
 
 #ifdef SIGTRAP
-static VOID sigtrdie(Sigarg)
+static void
+sigtrdie(Sigarg)
 {
 Use_Sigarg;
 sig_die("Trace trap", 1);
diff --git a/libf2c/libF77/signal1.h0 b/libf2c/libF77/signal1.h0
index 9a0af2762da..e38a8baa511 100644
--- a/libf2c/libF77/signal1.h0
+++ b/libf2c/libF77/signal1.h0
@@ -22,5 +22,5 @@ typedef Sigret_t (*sig_pf)(Sigarg_t);
 
 #define signal1(a,b) signal(a,(sig_pf)b)
 
-#define Sigarg Int n
+#define Sigarg int n
 #define Use_Sigarg n = n	/* shut up compiler warning */