5 files changed, 24 insertions, 21 deletions

diff --git a/sys/alpha/include/ansi.h b/sys/alpha/include/ansi.h
index 0aa285be89c9c..8338ce0d6ea81 100644
--- a/sys/alpha/include/ansi.h
+++ b/sys/alpha/include/ansi.h
@@ -72,11 +72,8 @@
 #define	_BSD_OFF_T_	long			/* file offset */
 #define	_BSD_PID_T_	int			/* process [group] */
 
-#if defined __GNUC__
-#if (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ > 95)
+#if defined __GNUC__ && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ > 95)
 #define	_BSD_VA_LIST_	__builtin_va_list	/* internally known to gcc */
-#endif
-typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
 #else
 typedef struct {
 	char *__base;
@@ -84,7 +81,10 @@ typedef struct {
 	int __pad;
 } __va_list;
 #define	_BSD_VA_LIST_	__va_list		/* va_list */
-#endif /*__GNUC__*/
+#endif /* post GCC 2.95 */
+#if defined __GNUC__
+typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
+#endif
 
 /*
  * The rune type above is declared to be an ``int'' instead of the more natural
diff --git a/sys/arm/include/ansi.h b/sys/arm/include/ansi.h
index ca6d5f2f588ee..d429b86cf0ac2 100644
--- a/sys/arm/include/ansi.h
+++ b/sys/arm/include/ansi.h
@@ -76,7 +76,10 @@
 #define	_BSD_VA_LIST_	__builtin_va_list	/* internally known to gcc */
 #else
 #define	_BSD_VA_LIST_	char *			/* va_list */
-#endif /*__GNUC__*/
+#endif /* post GCC 2.95 */
+#if defined __GNUC__
+typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
+#endif
 
 /*
  * The rune type above is declared to be an ``int'' instead of the more natural
diff --git a/sys/i386/include/ansi.h b/sys/i386/include/ansi.h
index c1ec23b6f1986..0870f35d0016b 100644
--- a/sys/i386/include/ansi.h
+++ b/sys/i386/include/ansi.h
@@ -71,14 +71,14 @@
 #define	_BSD_OFF_T_	__int64_t		/* file offset */
 #define	_BSD_PID_T_	int			/* process [group] */
 
-#if defined __GNUC__
-#if (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ > 95)
+#if defined __GNUC__ && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ > 95)
 #define	_BSD_VA_LIST_	__builtin_va_list	/* internally known to gcc */
-#endif
-typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
 #else
 #define	_BSD_VA_LIST_	char *			/* va_list */
-#endif /*__GNUC__*/
+#endif /* post GCC 2.95 */
+#if defined __GNUC__
+typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
+#endif
 
 /*
  * The rune type above is declared to be an ``int'' instead of the more natural
diff --git a/sys/powerpc/include/ansi.h b/sys/powerpc/include/ansi.h
index 7b8a05ef060c7..2295e4d41c3c2 100644
--- a/sys/powerpc/include/ansi.h
+++ b/sys/powerpc/include/ansi.h
@@ -71,11 +71,8 @@
 #define	_BSD_OFF_T_	__int64_t		/* file offset */
 #define	_BSD_PID_T_	int			/* process [group] */
 
-#if defined __GNUC__
-#if (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ > 95)
+#if defined __GNUC__ && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ > 95)
 #define	_BSD_VA_LIST_	__builtin_va_list	/* internally known to gcc */
-#endif
-typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
 #else
 typedef struct {
 	char __gpr;
@@ -85,7 +82,10 @@ typedef struct {
 	char *__base;
 } __va_list;
 #define	_BSD_VA_LIST_	__va_list		/* va_list */
-#endif /*__GNUC__*/
+#endif /* post GCC 2.95 */
+#if defined __GNUC__
+typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
+#endif
 
 /*
  * The rune type above is declared to be an ``int'' instead of the more natural
diff --git a/sys/sparc64/include/ansi.h b/sys/sparc64/include/ansi.h
index b974eb31c60cf..36e6753694bb8 100644
--- a/sys/sparc64/include/ansi.h
+++ b/sys/sparc64/include/ansi.h
@@ -72,14 +72,14 @@
 #define	_BSD_OFF_T_	long			/* file offset */
 #define	_BSD_PID_T_	int			/* process [group] */
 
-#if defined __GNUC__
-#if (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ > 95)
+#if defined __GNUC__ && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ > 95)
 #define	_BSD_VA_LIST_	__builtin_va_list	/* internally known to gcc */
-#endif
-typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
 #else
 #define	_BSD_VA_LIST_	char *			/* va_list */
-#endif /*__GNUC__*/
+#endif /* post GCC 2.95 */
+#if defined __GNUC__
+typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
+#endif
 
 /*
  * The rune type above is declared to be an ``int'' instead of the more natural