aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2014-09-15 10:16:14 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2014-09-15 10:16:14 +0530
commit61fe374a44a92621e0b75ec1f011ff1fba6c2148 (patch)
tree81627d3b57d49c5f12888fdf46f32034a7af3ab0
parent3f41521d4b9697634d3f574ee5fd3a22f217b25d (diff)
downloadglibc-61fe374a44a92621e0b75ec1f011ff1fba6c2148.zip
glibc-61fe374a44a92621e0b75ec1f011ff1fba6c2148.tar.gz
glibc-61fe374a44a92621e0b75ec1f011ff1fba6c2148.tar.bz2
Remove _POSIX_REGEX_VERSION
There is no _POSIX_REGEX_VERSION, so don't check for it. _REGEX_VERSION has been removed as well[1], so only keep the -1 return for backward compatibility. I found this when trying to make the getconf environment variables typo-proof. * sysdeps/posix/sysconf.c (__sysconf): Return -1 for _SC_REGEX_VERSION. [1] http://pubs.opengroup.org/onlinepubs/009695399/functions/sysconf.html
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/posix/sysconf.c6
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d010cc9..e316f8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2014-09-15 Siddhesh Poyarekar <siddhesh@redhat.com>
+ * sysdeps/posix/sysconf.c (__sysconf): Return -1 for
+ _SC_REGEX_VERSION.
+
* posix/getconf.c (vars): Add _POSIX_IPV6 and
_POSIX_RAW_SOCKETS.
diff --git a/sysdeps/posix/sysconf.c b/sysdeps/posix/sysconf.c
index cd2fb5a..e815cd5 100644
--- a/sysdeps/posix/sysconf.c
+++ b/sysdeps/posix/sysconf.c
@@ -983,12 +983,10 @@ __sysconf (name)
#else
return -1;
#endif
+ /* _REGEX_VERSION has been removed with IEEE Std 1003.1-2001/Cor 2-2004,
+ item XSH/TC2/D6/137. */
case _SC_REGEX_VERSION:
-#if _POSIX_REGEX_VERSION > 0
- return _POSIX_REGEX_VERSION;
-#else
return -1;
-#endif
case _SC_SHELL:
#if _POSIX_SHELL > 0