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

diff --git a/ChangeLog b/ChangeLog
index d010cc9dd0776d0617d9f544600a1bb1b3a6e645..e316f8c3b2e2efdeda9c2d72273be396423ab621 100644 (file)
--- 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 cd2fb5acda347058a91df288117280571746c116..e815cd5ff1365cb48a5e033c3bf24d763b976cf3 100644 (file)
--- 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