va-alpha.h: Protect entire second portion of the file against double inclusion.

        * ginclude/va-alpha.h: Protect entire second portion of the
        file against double inclusion.

From-SVN: r22200

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 75d58622055e66a14ff089c894467e8fe9cabe6e..4109c4e326892f94d4364c7f50b07695aab1c80b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep  3 00:23:21 1998  Richard Henderson  <rth@cygnus.com>
+
+       * ginclude/va-alpha.h: Protect entire second portion of the
+       file against double inclusion.
+
 Thu Sep  3 00:37:55 1998  Ovidiu Predescu  <ovidiu@aracnet.com>
 
        Added support for the Boehm's garbage collector.

diff --git a/gcc/ginclude/va-alpha.h b/gcc/ginclude/va-alpha.h
index 1d9e05df2c20b134fd58a103b37bc0c3449c48f4..2528a712ada2c5f89646db2c835302a5733df661 100644 (file)
--- a/gcc/ginclude/va-alpha.h
+++ b/gcc/ginclude/va-alpha.h
@@ -10,7 +10,6 @@
 #ifndef __GNUC_VA_LIST
 #define __GNUC_VA_LIST
 
-
 /* In VMS, __gnuc_va_list is simply char *; on OSF, it's a structure.  */
 
 #ifdef __VMS__
@@ -23,16 +22,19 @@ typedef struct {
 } __gnuc_va_list;
 #endif
 
-#endif /* not __GNUC_VA_LIST */
+#endif /* __GNUC_VA_LIST */
 
 /* If this is for internal libc use, don't define anything but
    __gnuc_va_list.  */
-#if defined (_STDARG_H) || defined (_VARARGS_H)
-typedef __gnuc_va_list va_list;
+
+#if !defined(__GNUC_VA_LIST_1) && (defined (_STDARG_H) || defined (_VARARGS_H))
+#define __GNUC_VA_LIST_1
 
 #define _VA_LIST
 #define _VA_LIST_
 
+typedef __gnuc_va_list va_list;
+
 #if !defined(_STDARG_H)
 
 /* varargs support */
@@ -63,8 +65,6 @@ typedef __gnuc_va_list va_list;
 
 #endif /* _STDARG_H */
 
-#ifndef va_end
-
 #define va_end(__va)   ((void) 0)
 
 /* Values returned by __builtin_classify_type.  */
@@ -92,8 +92,6 @@ enum {
   __lang_type_class
 };
 
-#endif
-
 /* Note that parameters are always aligned at least to a word boundary
    (when passed) regardless of what GCC's __alignof__ operator says.  */
 
@@ -127,4 +125,4 @@ enum {
 /* Copy __gnuc_va_list into another variable of this type.  */
 #define __va_copy(dest, src) (dest) = (src)
 
-#endif /* defined (_STDARG_H) || defined (_VARARGS_H) */
+#endif /* __GNUC_VA_LIST_1 */