From faf77c8f51dfd6e0e8703feb3f25df2b59a7492c Mon Sep 17 00:00:00 2001
From: hniksic <devnull@localhost>
Date: Fri, 12 Apr 2002 13:27:18 -0700
Subject: [PATCH] [svn] Only define _VA_LIST when compiling with gcc. Published
 in <sxsit6w1x5t.fsf@florida.arsdigita.de>.

---
 src/ChangeLog   | 5 +++++
 src/config.h.in | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 647a198f..07d25d9d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-12  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+	* config.h.in: Only define _VA_LIST when compiled with gcc.
+
 2002-04012  Ian Abbott  <abbotti@mev.co.uk>
 
 	* http.c (http_loop): Compensate for MS Windows two-second
@@ -18,6 +22,7 @@
 
 	* recur.c (download_child_p): Ditto.
 
+>>>>>>> 1.382
 2002-04-12  Hrvoje Niksic  <hniksic@arsdigita.com>
 
 	* config.h.in: Define _VA_LIST on Solaris to prevent stdio.h from
diff --git a/src/config.h.in b/src/config.h.in
index 2252bdda..da9ffc02 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -257,8 +257,11 @@ char *alloca ();
 
 #ifdef solaris
 # define NAMESPACE_TWEAKS
-/* Prevent stdio.h from declaring va_list. */
-# define _VA_LIST
+# ifdef __GNUC__
+/* Prevent stdio.h from declaring va_list and thus tripping gcc's
+   stdarg.h. */
+#  define _VA_LIST
+# endif
 #endif
 
 #ifdef __linux__