diff options
| -rw-r--r-- | gcc/ChangeLog | 126 | ||||
| -rw-r--r-- | gcc/calls.c | 8 | ||||
| -rw-r--r-- | gcc/cccp.c | 32 | ||||
| -rw-r--r-- | gcc/cexp.c | 12 | ||||
| -rw-r--r-- | gcc/cexp.y | 12 | ||||
| -rw-r--r-- | gcc/collect2.c | 12 | ||||
| -rw-r--r-- | gcc/combine.c | 4 | ||||
| -rw-r--r-- | gcc/cpperror.c | 8 | ||||
| -rw-r--r-- | gcc/cpplib.c | 28 | ||||
| -rw-r--r-- | gcc/cpplib.h | 4 | ||||
| -rw-r--r-- | gcc/demangle.h | 6 | ||||
| -rw-r--r-- | gcc/doprint.c | 4 | ||||
| -rw-r--r-- | gcc/emit-rtl.c | 8 | ||||
| -rw-r--r-- | gcc/final.c | 4 | ||||
| -rw-r--r-- | gcc/fix-header.c | 12 | ||||
| -rw-r--r-- | gcc/gansidecl.h | 55 | ||||
| -rw-r--r-- | gcc/gcc.c | 14 | ||||
| -rw-r--r-- | gcc/genattr.c | 4 | ||||
| -rw-r--r-- | gcc/genattrtab.c | 12 | ||||
| -rw-r--r-- | gcc/gencodes.c | 4 | ||||
| -rw-r--r-- | gcc/genconfig.c | 4 | ||||
| -rw-r--r-- | gcc/genemit.c | 4 | ||||
| -rw-r--r-- | gcc/genextract.c | 4 | ||||
| -rw-r--r-- | gcc/genflags.c | 4 | ||||
| -rw-r--r-- | gcc/genopinit.c | 4 | ||||
| -rw-r--r-- | gcc/genoutput.c | 8 | ||||
| -rw-r--r-- | gcc/genpeep.c | 4 | ||||
| -rw-r--r-- | gcc/genrecog.c | 4 | ||||
| -rw-r--r-- | gcc/halfpic.h | 2 | ||||
| -rw-r--r-- | gcc/hash.h | 26 | ||||
| -rw-r--r-- | gcc/mips-tfile.c | 23 | ||||
| -rw-r--r-- | gcc/prefix.c | 6 | ||||
| -rw-r--r-- | gcc/scan.h | 2 | ||||
| -rw-r--r-- | gcc/system.h | 2 | ||||
| -rw-r--r-- | gcc/toplev.c | 56 | ||||
| -rw-r--r-- | gcc/toplev.h | 2 | ||||
| -rw-r--r-- | gcc/tree.c | 12 |
37 files changed, 296 insertions, 240 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4bc5ffb7bfe..96e000ac896 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,129 @@ +Sun Nov 8 17:50:30 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * gansidecl.h: Prepend a "G" to the macro wrapping this file + (to distinguish it from the macro wrapping ansidecl.h.) + Include libiberty's ansidecl.h. Remove all redundant definitions. + Define the PROTO() style macros in terms of the PARAMS() ones. + + + * calls.c (emit_library_call): Switch on ANSI_PROTOTYPES, not + __STDC__, when deciding whether to use ANSI variable args. + (emit_library_call_value): Likewise. + + * cccp.c (error): Likewise. + (warning): Likewise. + (error_with_line): Likewise. + (warning_with_line): Likewise. + (pedwarn): Likewise. + (pedwarn_with_line): Likewise. + (pedwarn_with_file_and_line): Likewise. + (fatal): Likewise. + + * cexp.y (error): Likewise. + (pedwarn): Likewise. + (warning): Likewise. + + * collect2.c (fatal_perror): Likewise. + (fatal): Likewise. + (error): Likewise. + + * combine.c (gen_rtx_combine): Likewise. + + * cpperror.c (cpp_message): Likewise. + (cpp_fatal): Likewise. + + * cpplib.c (cpp_error): Likewise. + (cpp_warning): Likewise. + (cpp_pedwarn): Likewise. + (cpp_error_with_line): Likewise. + (cpp_warning_with_line): Likewise. + (cpp_pedwarn_with_line): Likewise. + (cpp_pedwarn_with_file_and_line): Likewise. + + * cpplib.h: Don't define PARAMS() macro. + + * demangle.h: Likewise. + + * doprint.c (checkit): Switch on ANSI_PROTOTYPES, not __STDC__, + when deciding whether to use ANSI variable args. + + * emit-rtl.c (gen_rtx): Likewise. + (gen_rtvec): Likewise. + + * final.c (asm_fprintf): Likewise. + + * fix-header.c (cpp_message): Likewise. + (fatal): Likewise. + (cpp_fatal): Likewise. + + * gcc.c (concat): Likewise. + (fatal): Likewise. + (error): Likewise. + + * genattr.c (fatal): Likewise. + + * genattrtab.c (attr_rtx): Likewise. + (attr_printf): Likewise. + (fatal): Likewise. + + * gencodes.c (fatal): Likewise. + + * genconfig.c (fatal): Likewise. + + * genemit.c (fatal): Likewise. + + * genextract.c (fatal): Likewise. + + * genflags.c (fatal): Likewise. + + * genopinit.c (fatal): Likewise. + + * genoutput.c (fatal): Likewise. + (error): Likewise. + + * genpeep.c (fatal): Likewise. + + * genrecog.c (fatal): Likewise. + + * halfpic.h: Switch on ANSI_PROTOTYPES, not __STDC__, when + deciding whether to declare `tree_node' and `rtx_def'. + + * hash.h: Don't define stuff we get from gansidecl.h. + + * mips-tfile.c: Likewise. Define __proto() in terms of PARAMS(). + (fatal): Switch on ANSI_PROTOTYPES, not __STDC__, when deciding + whether to use ANSI variable args. + (error): Likewise. + + * prefix.c (concat): Likewise. + + * scan.h: Likewise. + + * system.h: Likewise. + + * toplev.c (error_with_file_and_line): Likewise. + (error_with_decl): Likewise. + (error_for_asm): Likewise. + (error): Likewise. + (fatal): Likewise. + (warning_with_file_and_line): Likewise. + (warning_with_decl): Likewise. + (warning_for_asm): Likewise. + (warning): Likewise. + (pedwarn): Likewise. + (pedwarn_with_decl): Likewise. + (pedwarn_with_file_and_line): Likewise. + (sorry): Likewise. + (really_sorry): Likewise. + + * toplev.h: Switch on ANSI_PROTOTYPES, not __STDC__, when deciding + whether to declare `tree_node' and `rtx_def'. + + * tree.c (build): Switch on ANSI_PROTOTYPES, not __STDC__, when + deciding whether to use ANSI variable args. + (build_nt): Likewise. + (build_parse_node): Likewise. + Sun Nov 8 13:10:55 PST 1998 Jeff Law (law@cygnus.com) * version.c: Bump for snapshot. diff --git a/gcc/calls.c b/gcc/calls.c index d46973ae155..fb64c7588b3 100644 --- a/gcc/calls.c +++ b/gcc/calls.c @@ -2232,7 +2232,7 @@ void emit_library_call VPROTO((rtx orgfun, int no_queue, enum machine_mode outmode, int nargs, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES rtx orgfun; int no_queue; enum machine_mode outmode; @@ -2279,7 +2279,7 @@ emit_library_call VPROTO((rtx orgfun, int no_queue, enum machine_mode outmode, VA_START (p, nargs); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES orgfun = va_arg (p, rtx); no_queue = va_arg (p, int); outmode = va_arg (p, enum machine_mode); @@ -2723,7 +2723,7 @@ rtx emit_library_call_value VPROTO((rtx orgfun, rtx value, int no_queue, enum machine_mode outmode, int nargs, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES rtx orgfun; rtx value; int no_queue; @@ -2778,7 +2778,7 @@ emit_library_call_value VPROTO((rtx orgfun, rtx value, int no_queue, VA_START (p, nargs); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES orgfun = va_arg (p, rtx); value = va_arg (p, rtx); no_queue = va_arg (p, int); diff --git a/gcc/cccp.c b/gcc/cccp.c index 40e966385f9..e3568daa567 100644 --- a/gcc/cccp.c +++ b/gcc/cccp.c @@ -9312,14 +9312,14 @@ my_strerror (errnum) void error VPROTO ((char * msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char * msg; #endif va_list args; VA_START (args, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES msg = va_arg (args, char *); #endif @@ -9385,14 +9385,14 @@ error_from_errno (name) void warning VPROTO ((char * msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char * msg; #endif va_list args; VA_START (args, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES msg = va_arg (args, char *); #endif @@ -9434,7 +9434,7 @@ vwarning (msg, args) static void error_with_line VPROTO ((int line, char * msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES int line; char * msg; #endif @@ -9442,7 +9442,7 @@ error_with_line VPROTO ((int line, char * msg, ...)) VA_START (args, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES line = va_arg (args, int); msg = va_arg (args, char *); #endif @@ -9480,7 +9480,7 @@ verror_with_line (line, msg, args) static void warning_with_line VPROTO ((int line, char * msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES int line; char * msg; #endif @@ -9488,7 +9488,7 @@ warning_with_line VPROTO ((int line, char * msg, ...)) VA_START (args, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES line = va_arg (args, int); msg = va_arg (args, char *); #endif @@ -9534,14 +9534,14 @@ vwarning_with_line (line, msg, args) void pedwarn VPROTO ((char * msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char * msg; #endif va_list args; VA_START (args, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES msg = va_arg (args, char *); #endif @@ -9555,7 +9555,7 @@ pedwarn VPROTO ((char * msg, ...)) void pedwarn_with_line VPROTO ((int line, char * msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES int line; char * msg; #endif @@ -9563,7 +9563,7 @@ pedwarn_with_line VPROTO ((int line, char * msg, ...)) VA_START (args, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES line = va_arg (args, int); msg = va_arg (args, char *); #endif @@ -9582,7 +9582,7 @@ static void pedwarn_with_file_and_line VPROTO ((char *file, size_t file_len, int line, char * msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *file; size_t file_len; int line; @@ -9595,7 +9595,7 @@ pedwarn_with_file_and_line VPROTO ((char *file, size_t file_len, int line, VA_START (args, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES file = va_arg (args, char *); file_len = va_arg (args, size_t); line = va_arg (args, int); @@ -10623,7 +10623,7 @@ deps_output (string, spacer) static void fatal VPROTO ((char * msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char * msg; #endif va_list args; @@ -10631,7 +10631,7 @@ fatal VPROTO ((char * msg, ...)) fprintf (stderr, "%s: ", progname); VA_START (args, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES msg = va_arg (args, char *); #endif diff --git a/gcc/cexp.c b/gcc/cexp.c index ac5c2020c0d..d2d67f4c1cd 100644 --- a/gcc/cexp.c +++ b/gcc/cexp.c @@ -2080,14 +2080,14 @@ initialize_random_junk () void error VPROTO ((char * msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char * msg; #endif va_list args; VA_START (args, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES msg = va_arg (args, char *); #endif @@ -2100,14 +2100,14 @@ error VPROTO ((char * msg, ...)) void pedwarn VPROTO ((char * msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char * msg; #endif va_list args; VA_START (args, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES msg = va_arg (args, char *); #endif @@ -2120,14 +2120,14 @@ pedwarn VPROTO ((char * msg, ...)) void warning VPROTO ((char * msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char * msg; #endif va_list args; VA_START (args, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES msg = va_arg (args, char *); #endif diff --git a/gcc/cexp.y b/gcc/cexp.y index 00e439cb498..b3b5e9d99a3 100644 --- a/gcc/cexp.y +++ b/gcc/cexp.y @@ -1164,14 +1164,14 @@ initialize_random_junk () void error VPROTO ((char * msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char * msg; #endif va_list args; VA_START (args, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES msg = va_arg (args, char *); #endif @@ -1184,14 +1184,14 @@ error VPROTO ((char * msg, ...)) void pedwarn VPROTO ((char * msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char * msg; #endif va_list args; VA_START (args, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES msg = va_arg (args, char *); #endif @@ -1204,14 +1204,14 @@ pedwarn VPROTO ((char * msg, ...)) void warning VPROTO ((char * msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char * msg; #endif va_list args; VA_START (args, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES msg = va_arg (args, char *); #endif diff --git a/gcc/collect2.c b/gcc/collect2.c index 585ce59c1f4..729682e5f3b 100644 --- a/gcc/collect2.c +++ b/gcc/collect2.c @@ -425,7 +425,7 @@ collect_exit (status) void fatal_perror VPROTO((const char * string, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES const char *string; #endif int e = errno; @@ -433,7 +433,7 @@ fatal_perror VPROTO((const char * string, ...)) VA_START (ap, string); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES string = va_arg (ap, const char *); #endif @@ -450,14 +450,14 @@ fatal_perror VPROTO((const char * string, ...)) void fatal VPROTO((const char * string, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES const char *string; #endif va_list ap; VA_START (ap, string); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES string = va_arg (ap, const char *); #endif @@ -474,14 +474,14 @@ fatal VPROTO((const char * string, ...)) void error VPROTO((const char * string, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES const char * string; #endif va_list ap; VA_START (ap, string); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES string = va_arg (ap, const char *); #endif diff --git a/gcc/combine.c b/gcc/combine.c index 4094561fc8f..bd0a2254413 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -9288,7 +9288,7 @@ gen_lowpart_for_combine (mode, x) static rtx gen_rtx_combine VPROTO((enum rtx_code code, enum machine_mode mode, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES enum rtx_code code; enum machine_mode mode; #endif @@ -9302,7 +9302,7 @@ gen_rtx_combine VPROTO((enum rtx_code code, enum machine_mode mode, ...)) VA_START (p, mode); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES code = va_arg (p, enum rtx_code); mode = va_arg (p, enum machine_mode); #endif diff --git a/gcc/cpperror.c b/gcc/cpperror.c index 92b10465c68..107dc543e40 100644 --- a/gcc/cpperror.c +++ b/gcc/cpperror.c @@ -111,7 +111,7 @@ v_cpp_message (pfile, is_error, msg, ap) void cpp_message VPROTO ((cpp_reader *pfile, int is_error, const char *msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES cpp_reader *pfile; int is_error; const char *msg; @@ -120,7 +120,7 @@ cpp_message VPROTO ((cpp_reader *pfile, int is_error, const char *msg, ...)) VA_START (ap, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES pfile = va_arg (ap, cpp_reader *); is_error = va_arg (ap, int); msg = va_arg (ap, const char *); @@ -139,7 +139,7 @@ cpp_message VPROTO ((cpp_reader *pfile, int is_error, const char *msg, ...)) void cpp_fatal VPROTO ((cpp_reader *pfile, const char *str, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES cpp_reader *pfile; const char *str; #endif @@ -147,7 +147,7 @@ cpp_fatal VPROTO ((cpp_reader *pfile, const char *str, ...)) VA_START (ap, str); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES pfile = va_arg (ap, cpp_reader *); str = va_arg (ap, const char *); #endif diff --git a/gcc/cpplib.c b/gcc/cpplib.c index 38aeacf6fa8..f8a38e55bb1 100644 --- a/gcc/cpplib.c +++ b/gcc/cpplib.c @@ -6725,7 +6725,7 @@ v_cpp_error (pfile, msg, ap) void cpp_error VPROTO ((cpp_reader * pfile, const char *msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES cpp_reader *pfile; const char *msg; #endif @@ -6733,7 +6733,7 @@ cpp_error VPROTO ((cpp_reader * pfile, const char *msg, ...)) VA_START(ap, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES pfile = va_arg (ap, cpp_reader *); msg = va_arg (ap, const char *); #endif @@ -6764,7 +6764,7 @@ v_cpp_warning (pfile, msg, ap) void cpp_warning VPROTO ((cpp_reader * pfile, const char *msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES cpp_reader *pfile; const char *msg; #endif @@ -6772,7 +6772,7 @@ cpp_warning VPROTO ((cpp_reader * pfile, const char *msg, ...)) VA_START (ap, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES pfile = va_arg (ap, cpp_reader *); msg = va_arg (ap, const char *); #endif @@ -6786,7 +6786,7 @@ cpp_warning VPROTO ((cpp_reader * pfile, const char *msg, ...)) void cpp_pedwarn VPROTO ((cpp_reader * pfile, const char *msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES cpp_reader *pfile; const char *msg; #endif @@ -6794,7 +6794,7 @@ cpp_pedwarn VPROTO ((cpp_reader * pfile, const char *msg, ...)) VA_START (ap, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES pfile = va_arg (ap, cpp_reader *); msg = va_arg (ap, const char *); #endif @@ -6827,7 +6827,7 @@ v_cpp_error_with_line (pfile, line, column, msg, ap) void cpp_error_with_line VPROTO ((cpp_reader * pfile, int line, int column, const char *msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES cpp_reader *pfile; int line; int column; @@ -6837,7 +6837,7 @@ cpp_error_with_line VPROTO ((cpp_reader * pfile, int line, int column, const cha VA_START (ap, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES pfile = va_arg (ap, cpp_reader *); line = va_arg (ap, int); column = va_arg (ap, int); @@ -6878,7 +6878,7 @@ v_cpp_warning_with_line (pfile, line, column, msg, ap) static void cpp_warning_with_line VPROTO ((cpp_reader * pfile, int line, int column, const char *msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES cpp_reader *pfile; int line; int column; @@ -6888,7 +6888,7 @@ cpp_warning_with_line VPROTO ((cpp_reader * pfile, int line, int column, const c VA_START (ap, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES pfile = va_arg (ap, cpp_reader *); line = va_arg (ap, int); column = va_arg (ap, int); @@ -6903,7 +6903,7 @@ cpp_warning_with_line VPROTO ((cpp_reader * pfile, int line, int column, const c void cpp_pedwarn_with_line VPROTO ((cpp_reader * pfile, int line, int column, const char *msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES cpp_reader *pfile; int line; int column; @@ -6913,7 +6913,7 @@ cpp_pedwarn_with_line VPROTO ((cpp_reader * pfile, int line, int column, const c VA_START (ap, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES pfile = va_arg (ap, cpp_reader *); line = va_arg (ap, int); column = va_arg (ap, int); @@ -6933,7 +6933,7 @@ cpp_pedwarn_with_line VPROTO ((cpp_reader * pfile, int line, int column, const c void cpp_pedwarn_with_file_and_line VPROTO ((cpp_reader *pfile, char *file, int line, const char *msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES cpp_reader *pfile; char *file; int line; @@ -6943,7 +6943,7 @@ cpp_pedwarn_with_file_and_line VPROTO ((cpp_reader *pfile, char *file, int line, VA_START (ap, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES pfile = va_arg (ap, cpp_reader *); file = va_arg (ap, char *); line = va_arg (ap, int); diff --git a/gcc/cpplib.h b/gcc/cpplib.h index 3ff0c9214bf..99745c98f22 100644 --- a/gcc/cpplib.h +++ b/gcc/cpplib.h @@ -70,10 +70,6 @@ enum cpp_token { CPP_POP }; -#ifndef PARAMS -#define PARAMS(P) PROTO(P) -#endif /* !PARAMS */ - typedef enum cpp_token (*parse_underflow_t) PARAMS((cpp_reader *)); typedef int (*parse_cleanup_t) PARAMS((cpp_buffer *, cpp_reader *)); diff --git a/gcc/demangle.h b/gcc/demangle.h index 570b05718cf..eddb55510b3 100644 --- a/gcc/demangle.h +++ b/gcc/demangle.h @@ -20,11 +20,9 @@ #if !defined (DEMANGLE_H) #define DEMANGLE_H -#ifdef IN_GCC -#define PARAMS(ARGS) PROTO(ARGS) -#else /* ! IN_GCC */ +#ifndef IN_GCC #include <ansidecl.h> -#endif /* IN_GCC */ +#endif /* ! IN_GCC */ /* Options passed to cplus_demangle (in 2nd parameter). */ diff --git a/gcc/doprint.c b/gcc/doprint.c index 843c8474c4c..d53ccfa16a3 100644 --- a/gcc/doprint.c +++ b/gcc/doprint.c @@ -199,13 +199,13 @@ checkit VPROTO ((const char* format, ...)) va_list args; int result; -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *format; #endif VA_START (args, format); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES format = va_arg (args, char *); #endif diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c index 6f34788e1dd..a8bbfe42318 100644 --- a/gcc/emit-rtl.c +++ b/gcc/emit-rtl.c @@ -350,7 +350,7 @@ gen_rtx_MEM (mode, addr) rtx gen_rtx VPROTO((enum rtx_code code, enum machine_mode mode, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES enum rtx_code code; enum machine_mode mode; #endif @@ -361,7 +361,7 @@ gen_rtx VPROTO((enum rtx_code code, enum machine_mode mode, ...)) VA_START (p, mode); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES code = va_arg (p, enum rtx_code); mode = va_arg (p, enum machine_mode); #endif @@ -433,7 +433,7 @@ gen_rtx VPROTO((enum rtx_code code, enum machine_mode mode, ...)) rtvec gen_rtvec VPROTO((int n, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES int n; #endif int i; @@ -442,7 +442,7 @@ gen_rtvec VPROTO((int n, ...)) VA_START (p, n); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES n = va_arg (p, int); #endif diff --git a/gcc/final.c b/gcc/final.c index 18c4dc53143..be6f3312f7f 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -3694,7 +3694,7 @@ output_addr_const (file, x) void asm_fprintf VPROTO((FILE *file, char *p, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES FILE *file; char *p; #endif @@ -3704,7 +3704,7 @@ asm_fprintf VPROTO((FILE *file, char *p, ...)) VA_START (argptr, p); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES file = va_arg (argptr, FILE *); p = va_arg (argptr, char *); #endif diff --git a/gcc/fix-header.c b/gcc/fix-header.c index d515a32de75..08f5be427c2 100644 --- a/gcc/fix-header.c +++ b/gcc/fix-header.c @@ -1367,7 +1367,7 @@ v_cpp_message (pfile, is_error, msg, ap) void cpp_message VPROTO ((cpp_reader *pfile, int is_error, const char *msg, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES cpp_reader *pfile; int is_error; const char *msg; @@ -1376,7 +1376,7 @@ cpp_message VPROTO ((cpp_reader *pfile, int is_error, const char *msg, ...)) VA_START (ap, msg); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES pfile = va_arg (ap, cpp_reader *); is_error = va_arg (ap, const int); msg = va_arg (ap, const char *); @@ -1401,14 +1401,14 @@ v_fatal (str, ap) void fatal VPROTO ((const char *str, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES const char *str; #endif va_list ap; VA_START(ap, str); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES str = va_arg (ap, const char *); #endif @@ -1419,7 +1419,7 @@ fatal VPROTO ((const char *str, ...)) void cpp_fatal VPROTO ((cpp_reader * pfile ATTRIBUTE_UNUSED, const char *str, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES cpp_reader * pfile; const char *str; #endif @@ -1427,7 +1427,7 @@ cpp_fatal VPROTO ((cpp_reader * pfile ATTRIBUTE_UNUSED, const char *str, ...)) VA_START(ap, str); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES pfile = va_arg (ap, cpp_reader *); str = va_arg (ap, const char *); #endif diff --git a/gcc/gansidecl.h b/gcc/gansidecl.h index f9326403774..3ba99f59f4b 100644 --- a/gcc/gansidecl.h +++ b/gcc/gansidecl.h @@ -22,29 +22,17 @@ Boston, MA 02111-1307, USA. */ in binutils and gdb releases. ??? Over time the two should be merged into one. */ -#ifndef ANSIDECL_H -#define ANSIDECL_H +#ifndef __GANSIDECL_H__ +#define __GANSIDECL_H__ -/* Add prototype support. */ -#ifndef PROTO -#if defined (USE_PROTOTYPES) ? USE_PROTOTYPES : defined (__STDC__) -#define PROTO(ARGS) ARGS -#else -#define PROTO(ARGS) () -#endif -#endif +#include "ansidecl.h" -#ifndef VPROTO -#ifdef __STDC__ -#define PVPROTO(ARGS) ARGS -#define VPROTO(ARGS) ARGS -#define VA_START(va_list,var) va_start(va_list,var) -#else -#define PVPROTO(ARGS) () -#define VPROTO(ARGS) (va_alist) va_dcl -#define VA_START(va_list,var) va_start(va_list) -#endif -#endif +/* Undef ansidecl.h's "obsolete" version. */ +#undef PROTO +/* These macros are deprecated, use ansidecl.h's PARAMS style instead. */ +#define PROTO(ARGS) PARAMS(ARGS) +#define VPROTO(ARGS) VPARAMS(ARGS) +#define PVPROTO(ARGS) PARAMS(ARGS) #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) # define __attribute__(x) @@ -67,29 +55,10 @@ Boston, MA 02111-1307, USA. */ #define ATTRIBUTE_PRINTF_5 ATTRIBUTE_PRINTF(5, 6) #endif /* ATTRIBUTE_PRINTF */ -#ifndef GENERIC_PTR -#if defined (USE_PROTOTYPES) ? USE_PROTOTYPES : defined (__STDC__) -#define GENERIC_PTR void * -#else -#define GENERIC_PTR char * -#endif -#endif +#define GENERIC_PTR PTR #ifndef NULL_PTR -#define NULL_PTR ((GENERIC_PTR) 0) +#define NULL_PTR ((PTR) 0) #endif -#ifdef __STDC__ - -#define PTR void * - -#else - -#define PTR char * -#ifndef const -#define const -#endif - -#endif /* ! __STDC__ */ - -#endif /* ANSIDECL_H */ +#endif /* __GANSIDECL_H__ */ diff --git a/gcc/gcc.c b/gcc/gcc.c index 15e0fe6c7a7..d7ff558da97 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -5296,14 +5296,14 @@ concat VPROTO((char *first, ...)) register char *end; register char *arg; va_list args; -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *first; #endif /* First compute the size of the result and get sufficient memory. */ VA_START (args, first); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES first = va_arg (args, char *); #endif @@ -5322,7 +5322,7 @@ concat VPROTO((char *first, ...)) /* Now copy the individual pieces to the result string. */ VA_START (args, first); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES first = va_arg (args, char *); #endif @@ -5398,14 +5398,14 @@ fancy_abort () static void fatal VPROTO((char *format, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *format; #endif va_list ap; VA_START (ap, format); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES format = va_arg (ap, char *); #endif @@ -5420,14 +5420,14 @@ fatal VPROTO((char *format, ...)) static void error VPROTO((char *format, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *format; #endif va_list ap; VA_START (ap, format); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES format = va_arg (ap, char *); #endif diff --git a/gcc/genattr.c b/gcc/genattr.c index 9c062b5d112..dd44fde6ba8 100644 --- a/gcc/genattr.c +++ b/gcc/genattr.c @@ -224,14 +224,14 @@ xrealloc (ptr, size) static void fatal VPROTO ((char *format, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *format; #endif va_list ap; VA_START (ap, format); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES format = va_arg (ap, char *); #endif diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c index 8ac90c67bcc..8bb3dc69948 100644 --- a/gcc/genattrtab.c +++ b/gcc/genattrtab.c @@ -538,7 +538,7 @@ attr_hash_add_string (hashcode, str) static rtx attr_rtx VPROTO((enum rtx_code code, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES enum rtx_code code; #endif va_list p; @@ -551,7 +551,7 @@ attr_rtx VPROTO((enum rtx_code code, ...)) VA_START (p, code); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES code = va_arg (p, enum rtx_code); #endif @@ -735,7 +735,7 @@ attr_rtx VPROTO((enum rtx_code code, ...)) static char * attr_printf VPROTO((register int len, char *fmt, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES register int len; char *fmt; #endif @@ -744,7 +744,7 @@ attr_printf VPROTO((register int len, char *fmt, ...)) VA_START (p, fmt); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES len = va_arg (p, int); fmt = va_arg (p, char *); #endif @@ -5816,14 +5816,14 @@ copy_rtx_unchanging (orig) static void fatal VPROTO ((char *format, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *format; #endif va_list ap; VA_START (ap, format); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES format = va_arg (ap, char *); #endif diff --git a/gcc/gencodes.c b/gcc/gencodes.c index 429e4635f4d..696dbfb2802 100644 --- a/gcc/gencodes.c +++ b/gcc/gencodes.c @@ -82,14 +82,14 @@ xrealloc (ptr, size) static void fatal VPROTO ((char *format, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *format; #endif va_list ap; VA_START (ap, format); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES format = va_arg (ap, char *); #endif diff --git a/gcc/genconfig.c b/gcc/genconfig.c index 3e070a99f9c..e61e1a24ba9 100644 --- a/gcc/genconfig.c +++ b/gcc/genconfig.c @@ -271,14 +271,14 @@ xrealloc (ptr, size) static void fatal VPROTO ((char *format, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *format; #endif va_list ap; VA_START (ap, format); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES format = va_arg (ap, char *); #endif diff --git a/gcc/genemit.c b/gcc/genemit.c index d9281301b92..f67dacbb683 100644 --- a/gcc/genemit.c +++ b/gcc/genemit.c @@ -705,14 +705,14 @@ xrealloc (ptr, size) static void fatal VPROTO ((char *format, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *format; #endif va_list ap; VA_START (ap, format); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES format = va_arg (ap, char *); #endif diff --git a/gcc/genextract.c b/gcc/genextract.c index a1e48ed92ea..00bc571c991 100644 --- a/gcc/genextract.c +++ b/gcc/genextract.c @@ -373,14 +373,14 @@ xrealloc (ptr, size) static void fatal VPROTO ((char *format, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *format; #endif va_list ap; VA_START (ap, format); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES format = va_arg (ap, char *); #endif diff --git a/gcc/genflags.c b/gcc/genflags.c index c9214abdc9c..b56175f86a3 100644 --- a/gcc/genflags.c +++ b/gcc/genflags.c @@ -202,14 +202,14 @@ xrealloc (ptr, size) static void fatal VPROTO ((char *format, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *format; #endif va_list ap; VA_START (ap, format); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES format = va_arg (ap, char *); #endif diff --git a/gcc/genopinit.c b/gcc/genopinit.c index 066a0550708..985be8fdb0b 100644 --- a/gcc/genopinit.c +++ b/gcc/genopinit.c @@ -307,14 +307,14 @@ xrealloc (ptr, size) static void fatal VPROTO ((char *format, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *format; #endif va_list ap; VA_START (ap, format); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES format = va_arg (ap, char *); #endif diff --git a/gcc/genoutput.c b/gcc/genoutput.c index 89a37df080a..1651070c96d 100644 --- a/gcc/genoutput.c +++ b/gcc/genoutput.c @@ -925,14 +925,14 @@ mybcopy (b1, b2, length) static void fatal VPROTO ((char *format, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *format; #endif va_list ap; VA_START (ap, format); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES format = va_arg (ap, char *); #endif @@ -955,14 +955,14 @@ fancy_abort () static void error VPROTO ((char *format, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *format; #endif va_list ap; VA_START (ap, format); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES format = va_arg (ap, char *); #endif diff --git a/gcc/genpeep.c b/gcc/genpeep.c index 1430b63665a..ad9efabad4d 100644 --- a/gcc/genpeep.c +++ b/gcc/genpeep.c @@ -410,14 +410,14 @@ xrealloc (ptr, size) static void fatal VPROTO ((char *format, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *format; #endif va_list ap; VA_START (ap, format); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES format = va_arg (ap, char *); #endif diff --git a/gcc/genrecog.c b/gcc/genrecog.c index ee33a0c189e..db4566ad615 100644 --- a/gcc/genrecog.c +++ b/gcc/genrecog.c @@ -1685,14 +1685,14 @@ xmalloc (size) static void fatal VPROTO ((char *format, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *format; #endif va_list ap; VA_START (ap, format); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES format = va_arg (ap, char *); #endif diff --git a/gcc/halfpic.h b/gcc/halfpic.h index 96f62d45b86..a4f8961927d 100644 --- a/gcc/halfpic.h +++ b/gcc/halfpic.h @@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA. */ #ifndef NO_HALF_PIC -#if defined (USE_PROTOTYPES) ? USE_PROTOTYPES : defined (__STDC__) +#ifdef ANSI_PROTOTYPES union tree_node; /* forward reference */ struct rtx_def; #endif diff --git a/gcc/hash.h b/gcc/hash.h index 5a3838c5ace..5733daadab4 100644 --- a/gcc/hash.h +++ b/gcc/hash.h @@ -18,31 +18,9 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef IN_GCC - -/* Add prototype support. */ -#ifndef PROTO -#if defined (USE_PROTOTYPES) ? USE_PROTOTYPES : defined (__STDC__) -#define PROTO(ARGS) ARGS -#else -#define PROTO(ARGS) () -#endif -#endif - -#define PARAMS(ARGS) PROTO(ARGS) - -#ifdef __STDC__ -#define PTR void * -#else -#ifndef const -#define const -#endif -#define PTR char * -#endif - -#else /* ! IN_GCC */ +#ifndef IN_GCC #include <ansidecl.h> -#endif /* IN_GCC */ +#endif /* ! IN_GCC */ #include "obstack.h" diff --git a/gcc/mips-tfile.c b/gcc/mips-tfile.c index c1407703077..ad112fccbcb 100644 --- a/gcc/mips-tfile.c +++ b/gcc/mips-tfile.c @@ -610,15 +610,11 @@ Boston, MA 02111-1307, USA. */ #define __LINE__ 0 #endif +#define __proto(x) PARAMS(x) +/* Should PTR_T and CPTR_T be typedef'ed in terms of PTR ??? */ #ifdef __STDC__ typedef void *PTR_T; typedef const void *CPTR_T; -#define __proto(x) x -#ifndef VPROTO -#define PVPROTO(ARGS) ARGS -#define VPROTO(ARGS) ARGS -#define VA_START(va_list,var) va_start(va_list,var) -#endif #else #if defined(_STDIO_H_) || defined(__STDIO_H__) /* Ultrix 4.0, SGI */ @@ -630,13 +626,6 @@ typedef char *PTR_T; /* Ultrix 3.1 */ typedef char *CPTR_T; #endif -#define __proto(x) () -#define const -#ifndef VPROTO -#define PVPROTO(ARGS) () -#define VPROTO(ARGS) (va_alist) va_dcl -#define VA_START(va_list,var) va_start(va_list) -#endif #endif /* Do to size_t being defined in sys/types.h and different @@ -5607,14 +5596,14 @@ free_thead (ptr) void fatal VPROTO((const char *format, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *format; #endif va_list ap; VA_START (ap, format); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES format = va_arg (ap, char *); #endif @@ -5637,14 +5626,14 @@ fatal VPROTO((const char *format, ...)) void error VPROTO((const char *format, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *format; #endif va_list ap; VA_START (ap, format); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES format = va_arg (ap, char *); #endif diff --git a/gcc/prefix.c b/gcc/prefix.c index b949fce4e41..387ff462dd4 100644 --- a/gcc/prefix.c +++ b/gcc/prefix.c @@ -118,14 +118,14 @@ concat VPROTO((char *first, ...)) register char *end; register char *arg; va_list args; -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *first; #endif /* First compute the size of the result and get sufficient memory. */ VA_START (args, first); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES first = va_arg (args, char *); #endif @@ -144,7 +144,7 @@ concat VPROTO((char *first, ...)) /* Now copy the individual pieces to the result string. */ VA_START (args, first); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES first = va_arg (args, char *); #endif diff --git a/gcc/scan.h b/gcc/scan.h index 12879c015bf..f27c9a3ceb4 100644 --- a/gcc/scan.h +++ b/gcc/scan.h @@ -34,7 +34,7 @@ typedef struct sstring if ((STR)->limit - (STR)->ptr < (COUNT)) make_sstring_space (STR, COUNT); #ifndef _PARAMS -#if defined(__STDC__) || defined(__cplusplus) +#if defined(ANSI_PROTOTYPES) || defined(__cplusplus) #define _PARAMS(args) args #else #define _PARAMS(args) () diff --git a/gcc/system.h b/gcc/system.h index 0e78de09681..ca786a49c81 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -8,7 +8,7 @@ #define __GCC_SYSTEM_H__ /* We must include stdarg.h/varargs.h before stdio.h. */ -#ifdef __STDC__ +#ifdef ANSI_PROTOTYPES #include <stdarg.h> #else #include <varargs.h> diff --git a/gcc/toplev.c b/gcc/toplev.c index c79c4dff12a..851ed3e94e1 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -1659,7 +1659,7 @@ v_error_with_file_and_line (file, line, s, ap) void error_with_file_and_line VPROTO((char *file, int line, char *s, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *file; int line; char *s; @@ -1668,7 +1668,7 @@ error_with_file_and_line VPROTO((char *file, int line, char *s, ...)) VA_START (ap, s); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES file = va_arg (ap, char *); line = va_arg (ap, int); s = va_arg (ap, char *); @@ -1696,7 +1696,7 @@ v_error_with_decl (decl, s, ap) void error_with_decl VPROTO((tree decl, char *s, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES tree decl; char *s; #endif @@ -1704,7 +1704,7 @@ error_with_decl VPROTO((tree decl, char *s, ...)) VA_START (ap, s); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES decl = va_arg (ap, tree); s = va_arg (ap, char *); #endif @@ -1735,7 +1735,7 @@ v_error_for_asm (insn, s, ap) void error_for_asm VPROTO((rtx insn, char *s, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES rtx insn; char *s; #endif @@ -1743,7 +1743,7 @@ error_for_asm VPROTO((rtx insn, char *s, ...)) VA_START (ap, s); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES insn = va_arg (ap, rtx); s = va_arg (ap, char *); #endif @@ -1765,14 +1765,14 @@ verror (s, ap) void error VPROTO((char *s, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *s; #endif va_list ap; VA_START (ap, s); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES s = va_arg (ap, char *); #endif @@ -1794,14 +1794,14 @@ vfatal (s, ap) void fatal VPROTO((char *s, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *s; #endif va_list ap; VA_START (ap, s); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES s = va_arg (ap, char *); #endif @@ -1828,7 +1828,7 @@ v_warning_with_file_and_line (file, line, s, ap) void warning_with_file_and_line VPROTO((char *file, int line, char *s, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *file; int line; char *s; @@ -1837,7 +1837,7 @@ warning_with_file_and_line VPROTO((char *file, int line, char *s, ...)) VA_START (ap, s); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES file = va_arg (ap, char *); line = va_arg (ap, int); s = va_arg (ap, char *); @@ -1867,7 +1867,7 @@ v_warning_with_decl (decl, s, ap) void warning_with_decl VPROTO((tree decl, char *s, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES tree decl; char *s; #endif @@ -1875,7 +1875,7 @@ warning_with_decl VPROTO((tree decl, char *s, ...)) VA_START (ap, s); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES decl = va_arg (ap, tree); s = va_arg (ap, char *); #endif @@ -1908,7 +1908,7 @@ v_warning_for_asm (insn, s, ap) void warning_for_asm VPROTO((rtx insn, char *s, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES rtx insn; char *s; #endif @@ -1916,7 +1916,7 @@ warning_for_asm VPROTO((rtx insn, char *s, ...)) VA_START (ap, s); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES insn = va_arg (ap, rtx); s = va_arg (ap, char *); #endif @@ -1938,14 +1938,14 @@ vwarning (s, ap) void warning VPROTO((char *s, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *s; #endif va_list ap; VA_START (ap, s); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES s = va_arg (ap, char *); #endif @@ -1970,14 +1970,14 @@ vpedwarn (s, ap) void pedwarn VPROTO((char *s, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *s; #endif va_list ap; VA_START (ap, s); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES s = va_arg (ap, char *); #endif @@ -2010,7 +2010,7 @@ v_pedwarn_with_decl (decl, s, ap) void pedwarn_with_decl VPROTO((tree decl, char *s, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES tree decl; char *s; #endif @@ -2018,7 +2018,7 @@ pedwarn_with_decl VPROTO((tree decl, char *s, ...)) VA_START (ap, s); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES decl = va_arg (ap, tree); s = va_arg (ap, char *); #endif @@ -2043,7 +2043,7 @@ v_pedwarn_with_file_and_line (file, line, s, ap) void pedwarn_with_file_and_line VPROTO((char *file, int line, char *s, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *file; int line; char *s; @@ -2052,7 +2052,7 @@ pedwarn_with_file_and_line VPROTO((char *file, int line, char *s, ...)) VA_START (ap, s); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES file = va_arg (ap, char *); line = va_arg (ap, int); s = va_arg (ap, char *); @@ -2081,14 +2081,14 @@ vsorry (s, ap) void sorry VPROTO((char *s, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *s; #endif va_list ap; VA_START (ap, s); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES s = va_arg (ap, char *); #endif @@ -2115,14 +2115,14 @@ v_really_sorry (s, ap) void really_sorry VPROTO((char *s, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES char *s; #endif va_list ap; VA_START (ap, s); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES s = va_arg (ap, char *); #endif diff --git a/gcc/toplev.h b/gcc/toplev.h index 740dda12c31..38d0fca21fb 100644 --- a/gcc/toplev.h +++ b/gcc/toplev.h @@ -5,7 +5,7 @@ #ifndef __GCC_TOPLEV_H__ #define __GCC_TOPLEV_H__ -#ifdef __STDC__ +#ifdef ANSI_PROTOTYPES union tree_node; struct rtx_def; #endif diff --git a/gcc/tree.c b/gcc/tree.c index 6eb138f168b..de3655cb605 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -2983,7 +2983,7 @@ stabilize_reference_1 (e) tree build VPROTO((enum tree_code code, tree tt, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES enum tree_code code; tree tt; #endif @@ -2994,7 +2994,7 @@ build VPROTO((enum tree_code code, tree tt, ...)) VA_START (p, tt); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES code = va_arg (p, enum tree_code); tt = va_arg (p, tree); #endif @@ -3109,7 +3109,7 @@ build1 (code, type, node) tree build_nt VPROTO((enum tree_code code, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES enum tree_code code; #endif va_list p; @@ -3119,7 +3119,7 @@ build_nt VPROTO((enum tree_code code, ...)) VA_START (p, code); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES code = va_arg (p, enum tree_code); #endif @@ -3139,7 +3139,7 @@ build_nt VPROTO((enum tree_code code, ...)) tree build_parse_node VPROTO((enum tree_code code, ...)) { -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES enum tree_code code; #endif register struct obstack *ambient_obstack = expression_obstack; @@ -3150,7 +3150,7 @@ build_parse_node VPROTO((enum tree_code code, ...)) VA_START (p, code); -#ifndef __STDC__ +#ifndef ANSI_PROTOTYPES code = va_arg (p, enum tree_code); #endif |