Unifying ansidecl.h/gansidecl.h for gcc to include libiberty.h [3/3]
Kaveh R. Ghazi
ghazi@caip.rutgers.edu
Tue Nov 3 12:22:00 GMT 1998
This is part 3/3, okay to install?
--Kaveh
Mon Nov 2 11:18:46 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* genattr.c (fatal): Switch on ANSI_PROTOTYPES, not __STDC__, when
deciding whether to use ANSI variable args.
* 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.
diff -rup orig/egcs-CVS19981102/gcc/genattr.c egcs-CVS19981102/gcc/genattr.c
--- orig/egcs-CVS19981102/gcc/genattr.c Mon Nov 2 16:31:14 1998
+++ egcs-CVS19981102/gcc/genattr.c Tue Nov 3 13:50:32 1998
@@ -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 -rup orig/egcs-CVS19981102/gcc/genattrtab.c egcs-CVS19981102/gcc/genattrtab.c
--- orig/egcs-CVS19981102/gcc/genattrtab.c Mon Nov 2 16:30:45 1998
+++ egcs-CVS19981102/gcc/genattrtab.c Tue Nov 3 13:50:33 1998
@@ -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, ch
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 -rup orig/egcs-CVS19981102/gcc/gencodes.c egcs-CVS19981102/gcc/gencodes.c
--- orig/egcs-CVS19981102/gcc/gencodes.c Mon Nov 2 16:31:33 1998
+++ egcs-CVS19981102/gcc/gencodes.c Tue Nov 3 13:50:33 1998
@@ -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 -rup orig/egcs-CVS19981102/gcc/genconfig.c egcs-CVS19981102/gcc/genconfig.c
--- orig/egcs-CVS19981102/gcc/genconfig.c Mon Nov 2 16:31:33 1998
+++ egcs-CVS19981102/gcc/genconfig.c Tue Nov 3 13:50:33 1998
@@ -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 -rup orig/egcs-CVS19981102/gcc/genemit.c egcs-CVS19981102/gcc/genemit.c
--- orig/egcs-CVS19981102/gcc/genemit.c Mon Nov 2 16:31:33 1998
+++ egcs-CVS19981102/gcc/genemit.c Tue Nov 3 13:50:33 1998
@@ -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 -rup orig/egcs-CVS19981102/gcc/genextract.c egcs-CVS19981102/gcc/genextract.c
--- orig/egcs-CVS19981102/gcc/genextract.c Mon Nov 2 16:31:33 1998
+++ egcs-CVS19981102/gcc/genextract.c Tue Nov 3 13:50:33 1998
@@ -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 -rup orig/egcs-CVS19981102/gcc/genflags.c egcs-CVS19981102/gcc/genflags.c
--- orig/egcs-CVS19981102/gcc/genflags.c Mon Nov 2 16:31:34 1998
+++ egcs-CVS19981102/gcc/genflags.c Tue Nov 3 13:50:33 1998
@@ -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 -rup orig/egcs-CVS19981102/gcc/genopinit.c egcs-CVS19981102/gcc/genopinit.c
--- orig/egcs-CVS19981102/gcc/genopinit.c Mon Nov 2 16:31:34 1998
+++ egcs-CVS19981102/gcc/genopinit.c Tue Nov 3 13:50:33 1998
@@ -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 -rup orig/egcs-CVS19981102/gcc/genoutput.c egcs-CVS19981102/gcc/genoutput.c
--- orig/egcs-CVS19981102/gcc/genoutput.c Mon Nov 2 16:31:34 1998
+++ egcs-CVS19981102/gcc/genoutput.c Tue Nov 3 13:50:33 1998
@@ -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 -rup orig/egcs-CVS19981102/gcc/genpeep.c egcs-CVS19981102/gcc/genpeep.c
--- orig/egcs-CVS19981102/gcc/genpeep.c Mon Nov 2 16:31:34 1998
+++ egcs-CVS19981102/gcc/genpeep.c Tue Nov 3 13:50:33 1998
@@ -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 -rup orig/egcs-CVS19981102/gcc/genrecog.c egcs-CVS19981102/gcc/genrecog.c
--- orig/egcs-CVS19981102/gcc/genrecog.c Mon Nov 2 16:31:34 1998
+++ egcs-CVS19981102/gcc/genrecog.c Tue Nov 3 13:50:33 1998
@@ -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 -rup orig/egcs-CVS19981102/gcc/halfpic.h egcs-CVS19981102/gcc/halfpic.h
--- orig/egcs-CVS19981102/gcc/halfpic.h Tue Nov 3 13:51:27 1998
+++ egcs-CVS19981102/gcc/halfpic.h Tue Nov 3 13:50:33 1998
@@ -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 -rup orig/egcs-CVS19981102/gcc/hash.h egcs-CVS19981102/gcc/hash.h
--- orig/egcs-CVS19981102/gcc/hash.h Mon Nov 2 16:31:44 1998
+++ egcs-CVS19981102/gcc/hash.h Tue Nov 3 14:01:17 1998
@@ -18,31 +18,9 @@ You should have received a copy of the G
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 -rup orig/egcs-CVS19981102/gcc/mips-tfile.c egcs-CVS19981102/gcc/mips-tfile.c
--- orig/egcs-CVS19981102/gcc/mips-tfile.c Mon Nov 2 16:31:48 1998
+++ egcs-CVS19981102/gcc/mips-tfile.c Tue Nov 3 14:01:29 1998
@@ -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 -rup orig/egcs-CVS19981102/gcc/prefix.c egcs-CVS19981102/gcc/prefix.c
--- orig/egcs-CVS19981102/gcc/prefix.c Tue Nov 3 13:51:28 1998
+++ egcs-CVS19981102/gcc/prefix.c Tue Nov 3 13:50:35 1998
@@ -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 -rup orig/egcs-CVS19981102/gcc/scan.h egcs-CVS19981102/gcc/scan.h
--- orig/egcs-CVS19981102/gcc/scan.h Mon Nov 2 16:31:54 1998
+++ egcs-CVS19981102/gcc/scan.h Tue Nov 3 13:50:35 1998
@@ -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 -rup orig/egcs-CVS19981102/gcc/system.h egcs-CVS19981102/gcc/system.h
--- orig/egcs-CVS19981102/gcc/system.h Mon Nov 2 16:31:49 1998
+++ egcs-CVS19981102/gcc/system.h Tue Nov 3 14:01:54 1998
@@ -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 -rup orig/egcs-CVS19981102/gcc/toplev.c egcs-CVS19981102/gcc/toplev.c
--- orig/egcs-CVS19981102/gcc/toplev.c Mon Nov 2 16:31:42 1998
+++ egcs-CVS19981102/gcc/toplev.c Tue Nov 3 13:50:36 1998
@@ -1657,7 +1657,7 @@ v_error_with_file_and_line (file, line,
void
error_with_file_and_line VPROTO((char *file, int line, char *s, ...))
{
-#ifndef __STDC__
+#ifndef ANSI_PROTOTYPES
char *file;
int line;
char *s;
@@ -1666,7 +1666,7 @@ error_with_file_and_line VPROTO((char *f
VA_START (ap, s);
-#ifndef __STDC__
+#ifndef ANSI_PROTOTYPES
file = va_arg (ap, char *);
line = va_arg (ap, int);
s = va_arg (ap, char *);
@@ -1694,7 +1694,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
@@ -1702,7 +1702,7 @@ error_with_decl VPROTO((tree decl, char
VA_START (ap, s);
-#ifndef __STDC__
+#ifndef ANSI_PROTOTYPES
decl = va_arg (ap, tree);
s = va_arg (ap, char *);
#endif
@@ -1733,7 +1733,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
@@ -1741,7 +1741,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
@@ -1763,14 +1763,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
@@ -1792,14 +1792,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
@@ -1826,7 +1826,7 @@ v_warning_with_file_and_line (file, line
void
warning_with_file_and_line VPROTO((char *file, int line, char *s, ...))
{
-#ifndef __STDC__
+#ifndef ANSI_PROTOTYPES
char *file;
int line;
char *s;
@@ -1835,7 +1835,7 @@ warning_with_file_and_line VPROTO((char
VA_START (ap, s);
-#ifndef __STDC__
+#ifndef ANSI_PROTOTYPES
file = va_arg (ap, char *);
line = va_arg (ap, int);
s = va_arg (ap, char *);
@@ -1865,7 +1865,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
@@ -1873,7 +1873,7 @@ warning_with_decl VPROTO((tree decl, cha
VA_START (ap, s);
-#ifndef __STDC__
+#ifndef ANSI_PROTOTYPES
decl = va_arg (ap, tree);
s = va_arg (ap, char *);
#endif
@@ -1906,7 +1906,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
@@ -1914,7 +1914,7 @@ warning_for_asm VPROTO((rtx insn, char *
VA_START (ap, s);
-#ifndef __STDC__
+#ifndef ANSI_PROTOTYPES
insn = va_arg (ap, rtx);
s = va_arg (ap, char *);
#endif
@@ -1936,14 +1936,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
@@ -1968,14 +1968,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
@@ -2008,7 +2008,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
@@ -2016,7 +2016,7 @@ pedwarn_with_decl VPROTO((tree decl, cha
VA_START (ap, s);
-#ifndef __STDC__
+#ifndef ANSI_PROTOTYPES
decl = va_arg (ap, tree);
s = va_arg (ap, char *);
#endif
@@ -2041,7 +2041,7 @@ v_pedwarn_with_file_and_line (file, line
void
pedwarn_with_file_and_line VPROTO((char *file, int line, char *s, ...))
{
-#ifndef __STDC__
+#ifndef ANSI_PROTOTYPES
char *file;
int line;
char *s;
@@ -2050,7 +2050,7 @@ pedwarn_with_file_and_line VPROTO((char
VA_START (ap, s);
-#ifndef __STDC__
+#ifndef ANSI_PROTOTYPES
file = va_arg (ap, char *);
line = va_arg (ap, int);
s = va_arg (ap, char *);
@@ -2079,14 +2079,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
@@ -2113,14 +2113,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 -rup orig/egcs-CVS19981102/gcc/toplev.h egcs-CVS19981102/gcc/toplev.h
--- orig/egcs-CVS19981102/gcc/toplev.h Mon Nov 2 16:31:58 1998
+++ egcs-CVS19981102/gcc/toplev.h Tue Nov 3 13:50:36 1998
@@ -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 -rup orig/egcs-CVS19981102/gcc/tree.c egcs-CVS19981102/gcc/tree.c
--- orig/egcs-CVS19981102/gcc/tree.c Mon Nov 2 16:31:58 1998
+++ egcs-CVS19981102/gcc/tree.c Tue Nov 3 13:50:37 1998
@@ -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
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
VA_START (p, code);
-#ifndef __STDC__
+#ifndef ANSI_PROTOTYPES
code = va_arg (p, enum tree_code);
#endif
More information about the Gcc-patches
mailing list