diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-11-29 08:51:52 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-11-29 08:51:52 +0000 |
| commit | 8343eaee4af2c4fe69d5c2f4bd2b3407ad77fbf9 (patch) | |
| tree | cf881f1634582f8dee787022c268c2f192e3823c | |
| parent | 03a2c6475bd251773ddce5e9e5bb9b8d4c0baeab (diff) | |
| download | glibc-8343eaee4af2c4fe69d5c2f4bd2b3407ad77fbf9.tar.gz | |
Update.
2001-11-29 Ulrich Drepper <drepper@redhat.com>
* posix/regex.h: Define __restrict_arr correctly.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | posix/regex.h | 14 |
2 files changed, 13 insertions, 5 deletions
@@ -1,3 +1,7 @@ +2001-11-29 Ulrich Drepper <drepper@redhat.com> + + * posix/regex.h: Define __restrict_arr correctly. + 2001-11-28 Ulrich Drepper <drepper@redhat.com> * iconvdata/ibm1163.c: New file. diff --git a/posix/regex.h b/posix/regex.h index b9c2d97cce..8b8bb9d5a0 100644 --- a/posix/regex.h +++ b/posix/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, |