From: Jim Meyering <jim@meyering.net>
Date: Sat, 15 Dec 2001 16:57:15 +0000 (+0000)
Subject: (__restrict_arr): Update from libc.
X-Git-Tag: cvs-readonly~5489
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=ba951bdae778dee50674312a0b51838ed26be20f;p=gnulib.git

(__restrict_arr): Update from libc.
---

diff --git a/lib/regex.h b/lib/regex.h
index b9c2d97cc..8b8bb9d5a 100644
--- a/lib/regex.h
+++ b/lib/regex.h
@@ -1,6 +1,6 @@
 /* Definitions for data structures and routines for the regular
    expression library, version 0.12.
-   Copyright (C) 1985,1989-1993,1995-1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1985,1989-93,1995-98,2000,2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.  Its master source is NOT part of
    the C library, however.  The master source lives in /gd/gnu/lib.
 
@@ -529,10 +529,14 @@ extern int re_exec _RE_ARGS ((const char *));
 #  endif
 # endif
 #endif
-/* For now unconditionally define __restrict_arr to expand to nothing.
-   Ideally we would have a test for the compiler which allows defining
-   it to restrict.  */
-#define __restrict_arr
+/* gcc 3.1 and up support the [restrict] syntax.  */
+#ifndef __restrict_arr
+# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+#  define __restrict_arr __restrict
+# else
+#  define __restrict_arr
+# endif
+#endif
 
 /* POSIX compatibility.  */
 extern int regcomp _RE_ARGS ((regex_t *__restrict __preg,