From 9f9bd82e15a116238c43b54a6513e35cec8b86d4 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Fri, 19 Oct 2001 20:01:01 +0000
Subject: [PATCH] Try two on the preprocessing logic.

Reviewed by:	ru
---
 sys/alpha/include/ansi.h   | 2 +-
 sys/arm/include/ansi.h     | 2 +-
 sys/i386/include/ansi.h    | 4 ++--
 sys/powerpc/include/ansi.h | 2 +-
 sys/sparc64/include/ansi.h | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/alpha/include/ansi.h b/sys/alpha/include/ansi.h
index 8fd168281186..60f406c1a011 100644
--- a/sys/alpha/include/ansi.h
+++ b/sys/alpha/include/ansi.h
@@ -82,7 +82,7 @@ typedef struct {
 } __va_list;
 #define	_BSD_VA_LIST_	__va_list		/* va_list */
 #endif /* post GCC 2.95 */
-#if defined __GNUC__
+#ifdef __GNUC__
 typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
 #endif
 
diff --git a/sys/arm/include/ansi.h b/sys/arm/include/ansi.h
index fbb260940361..eb16c37a298b 100644
--- a/sys/arm/include/ansi.h
+++ b/sys/arm/include/ansi.h
@@ -77,7 +77,7 @@
 #else
 #define	_BSD_VA_LIST_	char *			/* va_list */
 #endif /* post GCC 2.95 */
-#if defined __GNUC__
+#ifdef __GNUC__
 typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
 #endif
 
diff --git a/sys/i386/include/ansi.h b/sys/i386/include/ansi.h
index c76bafc4f9c1..ff2186b7f571 100644
--- a/sys/i386/include/ansi.h
+++ b/sys/i386/include/ansi.h
@@ -71,12 +71,12 @@
 #define	_BSD_OFF_T_	__int64_t		/* file offset */
 #define	_BSD_PID_T_	int			/* process [group] */
 
-#if defined(__GNUC__) && (__GNUC__ > 3 || __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 */
 #else
 #define	_BSD_VA_LIST_	char *			/* va_list */
 #endif /* post GCC 2.95 */
-#if defined __GNUC__
+#ifdef __GNUC__
 typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
 #endif
 
diff --git a/sys/powerpc/include/ansi.h b/sys/powerpc/include/ansi.h
index 6f45cbe4e1c7..9dea29454b2b 100644
--- a/sys/powerpc/include/ansi.h
+++ b/sys/powerpc/include/ansi.h
@@ -84,7 +84,7 @@ typedef struct {
 #define	_BSD_VA_LIST_	__va_list		/* va_list */
 #endif /* post GCC 2.95 */
 #ifdef __GNUC__
-typedef	_BSD_VA_LIST_	__gnuc_va_list;		/* compatibility w/GNU headers*/
+typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
 #endif
 
 /*
diff --git a/sys/sparc64/include/ansi.h b/sys/sparc64/include/ansi.h
index 6d19927f505d..dfa6d4bc4733 100644
--- a/sys/sparc64/include/ansi.h
+++ b/sys/sparc64/include/ansi.h
@@ -77,7 +77,7 @@
 #else
 #define	_BSD_VA_LIST_	char *			/* va_list */
 #endif /* post GCC 2.95 */
-#if defined __GNUC__
+#ifdef __GNUC__
 typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
 #endif