From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11833 invoked by alias); 10 Mar 2009 13:26:23 -0000 Received: (qmail 11815 invoked by uid 22791); 10 Mar 2009 13:26:22 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 10 Mar 2009 13:26:13 +0000 Received: from sunsite.mff.cuni.cz (localhost.localdomain [127.0.0.1]) by sunsite.mff.cuni.cz (8.13.8/8.13.8) with ESMTP id n2ADWpLl010063; Tue, 10 Mar 2009 14:32:51 +0100 Received: (from jakub@localhost) by sunsite.mff.cuni.cz (8.13.8/8.13.8/Submit) id n2ADWpHH010062; Tue, 10 Mar 2009 14:32:51 +0100 Date: Tue, 10 Mar 2009 13:26:00 -0000 From: Jakub Jelinek To: Ulrich Drepper Cc: Glibc hackers Subject: [PATCH] Fix tst-sysconf Message-ID: <20090310133251.GJ16681@sunsite.ms.mff.cuni.cz> Reply-To: Jakub Jelinek Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.2i Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2009-03/txt/msg00002.txt.bz2 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 * 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