From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 19 Aug 2005 21:14:12 +0000 (+0000)
Subject: Import from gnulib.
X-Git-Tag: CPPI-1_12~109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff2fecfbe998d6586d5a4846ee39be0c4c8f1569;p=thirdparty%2Fcoreutils.git

Import from gnulib.
(__restrict_arr): Don't define to __restrict if __cplusplus is defined.
---

diff --git a/lib/regex.h b/lib/regex.h
index 0a59c7be1c..bdce605a3d 100644
--- a/lib/regex.h
+++ b/lib/regex.h
@@ -552,9 +552,9 @@ extern int re_exec _RE_ARGS ((const char *));
 #  endif
 # endif
 #endif
-/* gcc 3.1 and up support the [restrict] syntax.  */
+/* gcc 3.1 and up support the [restrict] syntax, but g++ doesn't.  */
 #ifndef __restrict_arr
-# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) && !defined __cplusplus
 #  define __restrict_arr __restrict
 # else
 #  define __restrict_arr