diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-08-10 20:49:28 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-08-10 20:49:28 +0000 |
| commit | 4a16cc52e0592048151cc3c09634007204ea48db (patch) | |
| tree | 1f4571c397da4f43a97b6a9ec1db5575a42e767e /lib/regex.h | |
| parent | Update cycle-check from gnulib. (diff) | |
| download | coreutils-4a16cc52e0592048151cc3c09634007204ea48db.tar.gz coreutils-4a16cc52e0592048151cc3c09634007204ea48db.zip | |
Import regex changes from libc via gnulib.
Diffstat (limited to 'lib/regex.h')
| -rw-r--r-- | lib/regex.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/regex.h b/lib/regex.h index 51857e559..e8748e195 100644 --- a/lib/regex.h +++ b/lib/regex.h @@ -37,12 +37,6 @@ extern "C" { # define __USE_GNU_REGEX 1 #endif -#ifdef __VMS -/* VMS doesn't have `size_t' in <sys/types.h>, even though POSIX says it - should be there. */ -# include <stddef.h> -#endif - #ifdef _REGEX_LARGE_OFFSETS /* Use types and values that are wide enough to represent signed and @@ -641,9 +635,10 @@ extern int re_exec (const char *); # endif # endif #endif -/* gcc 3.1 and up support the [restrict] syntax, but g++ doesn't. */ +/* gcc 3.1 and up support the [restrict] syntax. */ #ifndef __restrict_arr -# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) && !defined __cplusplus +# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) \ + && !defined __GNUG__ # define __restrict_arr __restrict # else # define __restrict_arr |