diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ginclude/stdarg.h | 7 | ||||
| -rw-r--r-- | gcc/ginclude/varargs.h | 8 |
3 files changed, 7 insertions, 13 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5aff3d1..a78494f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 16 20:11:36 1997 Jeffrey A Law (law@cygnus.com) + + * ginclude/stdarg.h: Undo BeOS changes, they break hpux. + * ginclude/varargs.h: Likewise. + Tue Dec 16 00:32:01 1997 Jeffrey A Law (law@cygnus.com) * version.c: Bump for snapshot. diff --git a/gcc/ginclude/stdarg.h b/gcc/ginclude/stdarg.h index 71673fb..24f3383 100644 --- a/gcc/ginclude/stdarg.h +++ b/gcc/ginclude/stdarg.h @@ -64,7 +64,7 @@ #ifndef __GNUC_VA_LIST #define __GNUC_VA_LIST -#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__) || defined (__BEOS__) +#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__) typedef char *__gnuc_va_list; #else typedef void *__gnuc_va_list; @@ -178,9 +178,7 @@ typedef __gnuc_va_list va_list; #ifndef _VA_LIST /* The macro _VA_LIST_T_H is used in the Bull dpx2 */ #ifndef _VA_LIST_T_H -#ifndef __va_list__ typedef __gnuc_va_list va_list; -#endif /* not __va_list__ */ #endif /* not _VA_LIST_T_H */ #endif /* not _VA_LIST */ #endif /* not _VA_LIST_DEFINED */ @@ -196,9 +194,6 @@ typedef __gnuc_va_list va_list; #ifndef _VA_LIST_T_H #define _VA_LIST_T_H #endif -#ifndef __va_list__ -#define __va_list__ /* BeOS */ -#endif #endif /* not _VA_LIST_, except on certain systems */ diff --git a/gcc/ginclude/varargs.h b/gcc/ginclude/varargs.h index 4259b9f..410d06a 100644 --- a/gcc/ginclude/varargs.h +++ b/gcc/ginclude/varargs.h @@ -96,7 +96,7 @@ #ifndef __GNUC_VA_LIST #define __GNUC_VA_LIST -#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__BEOS__) +#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) typedef char *__gnuc_va_list; #else typedef void *__gnuc_va_list; @@ -192,10 +192,7 @@ typedef __gnuc_va_list va_list; #ifndef _VA_LIST /* The macro _VA_LIST_T_H is used in the Bull dpx2 */ #ifndef _VA_LIST_T_H -/* The macro __va_list__ is used in BeOS */ -#ifndef __va_list__ typedef __gnuc_va_list va_list; -#endif /* not __va_list__ */ #endif /* not _VA_LIST_T_H */ #endif /* not _VA_LIST */ #endif /* not _VA_LIST_DEFINED */ @@ -211,9 +208,6 @@ typedef __gnuc_va_list va_list; #ifndef _VA_LIST_T_H #define _VA_LIST_T_H #endif -#ifndef __va_list__ /* BeOS */ -#define __va_list__ -#endif #endif /* not _VA_LIST_, except on certain systems */ |