Mercurial > hg > octave-nkf > gnulib-hg

diff lib/regex.h @ 6041:05710fe33bb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* config/srclist.txt: Comment out $LIBCSRC/posix/regex.h. Add comments for each pending glibc patch. * lib/regex.h (__restrict_arr): Don't define to __restrict if __cplusplus is defined.
author Paul Eggert <eggert@cs.ucla.edu>
date Tue, 16 Aug 2005 00:07:03 +0000 (2005-08-16)
parents 541fed6ae301
children d04ae1c037f0
line wrap: on
line diff
--- a/lib/regex.h
+++ b/lib/regex.h
@@ -552,9 +552,9 @@
 #  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