aboutsummaryrefslogtreecommitdiff
path: root/posix/regex.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-12-26 14:13:43 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2018-12-27 11:17:06 -0800
commitc0feb731d5bd063f351487c28eadaf37b33d07a5 (patch)
tree7e8a78f51ab1f1b0cb257f518bd93af30c9ccc58 /posix/regex.c
parent5289f1f56b7174da6b036d24a7626d9cd658fb01 (diff)
downloadglibc-c0feb731d5bd063f351487c28eadaf37b33d07a5.zip
glibc-c0feb731d5bd063f351487c28eadaf37b33d07a5.tar.gz
glibc-c0feb731d5bd063f351487c28eadaf37b33d07a5.tar.bz2
regex: simplify Gnulib port
This simplifies the code, by removing stuff intended for porting to Gnulib but no longer needed there. * posix/regcomp.c [!_LIBC]: No need to put #ifdef _LIBC around uses of libc_hidden_def, weak_alias. * posix/regcomp.c, posix/regexec.c: Use __restrict rather than _Restrict_ except for public-facing headers. * posix/regex_internal.h (attribute_hidden) [!_LIBC]: Remove; already defined elsewhere. * posix/regex.c, posix/regex_internal.h: Use __GNUC_PREREQ instead of rolling our own. * posix/regex_internal.h (__GNUC_PREREQ): Remove duplicate defn.
Diffstat (limited to 'posix/regex.c')
-rw-r--r--posix/regex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/posix/regex.c b/posix/regex.c
index a80e740..9d2071d 100644
--- a/posix/regex.c
+++ b/posix/regex.c
@@ -20,10 +20,10 @@
#ifndef _LIBC
# include <libc-config.h>
-# if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
+# if __GNUC_PREREQ (4, 6)
# pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"
# endif
-# if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
+# if __GNUC_PREREQ (4, 3)
# pragma GCC diagnostic ignored "-Wold-style-definition"
# pragma GCC diagnostic ignored "-Wtype-limits"
# endif