diff options
| author | Richard Kenner <kenner@gcc.gnu.org> | 1995-04-13 08:50:20 -0400 |
|---|---|---|
| committer | Richard Kenner <kenner@gcc.gnu.org> | 1995-04-13 08:50:20 -0400 |
| commit | 0f2101cc2800ec3488b055ac5307b7e1a1f25dd9 (patch) | |
| tree | a8b10881ebcb8c556d3b6bb2fc6ef30fc3068287 /gcc/ginclude | |
| parent | 9f154156a1d009daf345cc51f40ddc2a902641e2 (diff) | |
| download | gcc-0f2101cc2800ec3488b055ac5307b7e1a1f25dd9.zip gcc-0f2101cc2800ec3488b055ac5307b7e1a1f25dd9.tar.gz gcc-0f2101cc2800ec3488b055ac5307b7e1a1f25dd9.tar.bz2 | |
Clean up code that defines *DEFINED* symbols.
From-SVN: r9376
Diffstat (limited to 'gcc/ginclude')
| -rw-r--r-- | gcc/ginclude/stdarg.h | 25 | ||||
| -rw-r--r-- | gcc/ginclude/varargs.h | 19 |
2 files changed, 29 insertions, 15 deletions
diff --git a/gcc/ginclude/stdarg.h b/gcc/ginclude/stdarg.h index d3dea62..0ac176e 100644 --- a/gcc/ginclude/stdarg.h +++ b/gcc/ginclude/stdarg.h @@ -136,24 +136,31 @@ typedef __gnuc_va_list va_list; But on BSD NET2 we must not test or define or undef it. (Note that the comments in NET 2's ansi.h are incorrect for _VA_LIST_--see stdio.h!) */ -#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__FreeBSD__) -/* The macro _VA_LIST_DEFINED is used in Windows NT 3.5 */ +#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__) || defined(WINNT) +/* The macro _VA_LIST_DEFINED is used in Windows NT 3.5 */ #ifndef _VA_LIST_DEFINED /* The macro _VA_LIST is used in SCO Unix 3.2. */ #ifndef _VA_LIST /* The macro _VA_LIST_T_H is used in the Bull dpx2 */ #ifndef _VA_LIST_T_H -#define _VA_LIST_T_H -#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__FreeBSD__)) -#define _VA_LIST_ -#endif -#define _VA_LIST -#define _VA_LIST_DEFINED typedef __gnuc_va_list va_list; #endif /* not _VA_LIST_T_H */ #endif /* not _VA_LIST */ #endif /* not _VA_LIST_DEFINED */ -#endif /* not _VA_LIST_ */ +#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__)) +#define _VA_LIST_ +#endif +#ifndef _VA_LIST +#define _VA_LIST +#endif +#ifndef _VA_LIST_DEFINED +#define _VA_LIST_DEFINED +#endif +#ifndef _VA_LIST_T_H +#define _VA_LIST_T_H +#endif + +#endif /* not _VA_LIST_, except on certain systems */ #endif /* not __svr4__ */ diff --git a/gcc/ginclude/varargs.h b/gcc/ginclude/varargs.h index 8a9b419..68e20a6 100644 --- a/gcc/ginclude/varargs.h +++ b/gcc/ginclude/varargs.h @@ -151,23 +151,30 @@ typedef __gnuc_va_list va_list; /* Michael Eriksson <mer@sics.se> at Thu Sep 30 11:00:57 1993: Sequent defines _VA_LIST_ in <machine/machtypes.h> to be the type to use for va_list (``typedef _VA_LIST_ va_list'') */ -#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__) +#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__) || defined(WINNT) /* The macro _VA_LIST_DEFINED is used in Windows NT 3.5 */ #ifndef _VA_LIST_DEFINED /* The macro _VA_LIST is used in SCO Unix 3.2. */ #ifndef _VA_LIST /* The macro _VA_LIST_T_H is used in the Bull dpx2 */ #ifndef _VA_LIST_T_H -#define _VA_LIST_T_H +typedef __gnuc_va_list va_list; +#endif /* not _VA_LIST_T_H */ +#endif /* not _VA_LIST */ +#endif /* not _VA_LIST_DEFINED */ #if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__)) #define _VA_LIST_ #endif +#ifndef _VA_LIST #define _VA_LIST +#endif +#ifndef _VA_LIST_DEFINED #define _VA_LIST_DEFINED -typedef __gnuc_va_list va_list; -#endif /* not _VA_LIST_T_H */ -#endif /* not _VA_LIST */ -#endif /* not _VA_LIST_DEFINED */ +#endif +#ifndef _VA_LIST_T_H +#define _VA_LIST_T_H +#endif + #endif /* not _VA_LIST_, except on certain systems */ #endif /* not __svr4__ */ |