aboutsummaryrefslogtreecommitdiff
path: root/gcc/ginclude
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/ginclude')
-rw-r--r--gcc/ginclude/stdarg.h6
-rw-r--r--gcc/ginclude/stddef.h4
-rw-r--r--gcc/ginclude/varargs.h6
3 files changed, 12 insertions, 4 deletions
diff --git a/gcc/ginclude/stdarg.h b/gcc/ginclude/stdarg.h
index 2464599..3337065 100644
--- a/gcc/ginclude/stdarg.h
+++ b/gcc/ginclude/stdarg.h
@@ -105,7 +105,10 @@ 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 by 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 */
@@ -121,6 +124,9 @@ typedef __gnuc_va_list va_list;
#ifndef _VA_LIST_T_H
#define _VA_LIST_T_H
#endif
+#ifndef __va_list__
+#define __va_list__
+#endif
#endif /* not _VA_LIST_, except on certain systems */
diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h
index 0004ec7..ae1037f 100644
--- a/gcc/ginclude/stddef.h
+++ b/gcc/ginclude/stddef.h
@@ -274,12 +274,8 @@ typedef _BSD_RUNE_T_ rune_t;
#endif
#ifndef __WCHAR_TYPE__
-#ifdef __BEOS__
-#define __WCHAR_TYPE__ unsigned char
-#else
#define __WCHAR_TYPE__ int
#endif
-#endif
#ifndef __cplusplus
typedef __WCHAR_TYPE__ wchar_t;
#endif
diff --git a/gcc/ginclude/varargs.h b/gcc/ginclude/varargs.h
index 6c70f7a..210b967 100644
--- a/gcc/ginclude/varargs.h
+++ b/gcc/ginclude/varargs.h
@@ -108,7 +108,10 @@ 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 by 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 */
@@ -124,6 +127,9 @@ typedef __gnuc_va_list va_list;
#ifndef _VA_LIST_T_H
#define _VA_LIST_T_H
#endif
+#ifndef __va_list__
+#define __va_list__
+#endif
#endif /* not _VA_LIST_, except on certain systems */