[PATCH] Fix tst-sysconf

[PATCH] Fix tst-sysconf

[Jakub Jelinek]

Hi!

tst-sysconf currently fails, as most vars changed from 200112L to
200809L (but not all).  The patch below changes the remaining ones
and updates tst-sysconf.c to expect it.
Not sure about the number after dash in 9945-1 in the comment though.

2009-03-10  Jakub Jelinek  <jakub@redhat.com>

	* posix/unistd.h (_POSIX_VERSION, _POSIX2_VERSION, _POSIX2_C_BIND,
	_POSIX2_C_DEV, _POSIX2_SW_DEV, _POSIX2_LOCALEDEF): Define to
	200809L instead of 200112L.
	(_XOPEN_VERSION): For __USE_XOPEN2K8 define to 700.
	* posix/tst-sysconf.c (STDVER): Define to 200809L instead of 200112L.

--- libc/posix/tst-sysconf.c.jj	2004-11-27 23:45:44.000000000 +0100
+++ libc/posix/tst-sysconf.c	2009-03-10 13:27:05.000000000 +0100
@@ -97,7 +97,7 @@ do_test (void)
 	  result = 1;
 	}
 
-#define STDVER 200112L
+#define STDVER 200809L
       if (scret > 0 && scret != STDVER && !posix_options[i].positive)
 	{
 	  printf ("sysconf(_SC_%s%s) must be %ldL\n",
--- libc/posix/unistd.h.jj	2009-03-02 16:44:03.000000000 +0100
+++ libc/posix/unistd.h	2009-03-10 13:45:11.000000000 +0100
@@ -30,33 +30,35 @@ __BEGIN_DECLS
 /* These may be used to determine what facilities are present at compile time.
    Their values can be obtained at run time from `sysconf'.  */
 
-/* POSIX Standard approved as ISO/IEC 9945-1 as of December 2001.  */
-#define	_POSIX_VERSION	200112L
+/* POSIX Standard approved as ISO/IEC 9945-1 as of September 2008.  */
+#define	_POSIX_VERSION	200809L
 
 /* These are not #ifdef __USE_POSIX2 because they are
    in the theoretically application-owned namespace.  */
 
 /* The utilities on GNU systems also correspond to this version.  */
-#define _POSIX2_VERSION	200112L
+#define _POSIX2_VERSION	200809L
 
 /* If defined, the implementation supports the
    C Language Bindings Option.  */
-#define	_POSIX2_C_BIND	200112L
+#define	_POSIX2_C_BIND	200809L
 
 /* If defined, the implementation supports the
    C Language Development Utilities Option.  */
-#define	_POSIX2_C_DEV	200112L
+#define	_POSIX2_C_DEV	200809L
 
 /* If defined, the implementation supports the
    Software Development Utilities Option.  */
-#define	_POSIX2_SW_DEV	200112L
+#define	_POSIX2_SW_DEV	200809L
 
 /* If defined, the implementation supports the
    creation of locales with the localedef utility.  */
-#define _POSIX2_LOCALEDEF       200112L
+#define _POSIX2_LOCALEDEF       200809L
 
 /* X/Open version number to which the library conforms.  It is selectable.  */
-#ifdef __USE_XOPEN2K
+#ifdef __USE_XOPEN2K8
+# define _XOPEN_VERSION	700
+#elif defined __USE_XOPEN2K
 # define _XOPEN_VERSION	600
 #elif defined __USE_UNIX98
 # define _XOPEN_VERSION	500

	Jakub