From: hniksic <devnull@localhost>
Date: Mon, 30 May 2005 18:44:20 +0000 (-0700)
Subject: [svn] Check for a recent gcc version before using the statement-as-expression
X-Git-Tag: v1.13~1006
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=71911ea593d0c7a2c5e2f16427b7895df46561d1

[svn] Check for a recent gcc version before using the statement-as-expression
extension.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 212f2800..023fec49 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-30  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* url.c (strpbrk_or_eos): Check for a recent GCC version before
+	using the statement-as-expression extension.
+
 2005-05-30  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* http.c (gethttp): Don't attempt to "skip short body" if we're
diff --git a/src/url.c b/src/url.c
index 8cbb8923..3db7c2fb 100644
--- a/src/url.c
+++ b/src/url.c
@@ -584,7 +584,7 @@ static void split_path PARAMS ((const char *, char **, char **));
    help because the check for literal accept is in the
    preprocessor.)  */
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && __GNUC__ >= 3
 
 #define strpbrk_or_eos(s, accept) ({		\
   char *SOE_p = strpbrk (s, accept);		\
@@ -593,7 +593,7 @@ static void split_path PARAMS ((const char *, char **, char **));
   SOE_p;					\
 })
 
-#else  /* not __GNUC__ */
+#else  /* not __GNUC__ or old gcc */
 
 static inline char *
 strpbrk_or_eos (const char *s, const char *accept)
@@ -603,7 +603,7 @@ strpbrk_or_eos (const char *s, const char *accept)
     p = strchr (s, '\0');
   return p;
 }
-#endif /* not __GNUC__ */
+#endif /* not __GNUC__ or old gcc */
 
 /* Turn STR into lowercase; return non-zero if a character was
    actually changed. */