diff options
author | Tom Tromey <tromey@redhat.com> | 2013-06-03 12:25:05 -0600 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2013-06-03 12:25:05 -0600 |
commit | 68359abba96d7ec4db8aab3d3dd9cf1105c3bab5 (patch) | |
tree | 862703e7e1a1888170136a8296a5750d6b2ae2eb /src/regex.h | |
parent | cbcba8ce7f980b01c18c0fd561ef6687b1361507 (diff) | |
parent | e2d8a6f0a229b4ebe26484b892ec4f14888f58b6 (diff) | |
download | emacs-68359abba96d7ec4db8aab3d3dd9cf1105c3bab5.tar.gz emacs-68359abba96d7ec4db8aab3d3dd9cf1105c3bab5.tar.bz2 emacs-68359abba96d7ec4db8aab3d3dd9cf1105c3bab5.zip |
merge from trunk; clean up some issues
Diffstat (limited to 'src/regex.h')
-rw-r--r-- | src/regex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/regex.h b/src/regex.h index 36fb4321027..175eed10177 100644 --- a/src/regex.h +++ b/src/regex.h @@ -530,7 +530,7 @@ extern int re_exec (const char *); /* GCC 2.95 and later have "__restrict"; C99 compilers have "restrict", and "configure" may have defined "restrict". */ #ifndef __restrict -# if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__)) +# if ! (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) # if defined restrict || 199901L <= __STDC_VERSION__ # define __restrict restrict # else |