From 38d3d5b7bdf251d5c549f5baef3ad5d2d144688a Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 20 May 2015 22:56:27 +0000 Subject: conformtest: correct POSIX expectations for locale.h. When cleaning up conformtest expectations for POSIX for locale.h in , I missed that locale.h had contents defined in POSIX.2:1993 as well as POSIX.1:1995/6. Thus, LC_MESSAGES *should* in fact be required for POSIX, because POSIX.2 says so; this patch adds that expectation back. Tested for x86_64. * conform/data/locale.h-data [POSIX] (LC_MESSAGES): Require. --- ChangeLog | 2 ++ conform/data/locale.h-data | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 32eda8f961..d6a601200d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2015-05-20 Joseph Myers + * conform/data/locale.h-data [POSIX] (LC_MESSAGES): Require. + * conform/data/unistd.h-data (_POSIX_VERSION): Require. (_POSIX2_C_VERSION): Require if [POSIX || XPG3 || XPG4 || UNIX98]. Do not mention otherwise. diff --git a/conform/data/locale.h-data b/conform/data/locale.h-data index 003e6cace8..adcd25f656 100644 --- a/conform/data/locale.h-data +++ b/conform/data/locale.h-data @@ -31,7 +31,7 @@ macro-constant NULL == 0 macro-int-constant LC_ALL macro-int-constant LC_COLLATE macro-int-constant LC_CTYPE -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 macro-int-constant LC_MESSAGES #endif macro-int-constant LC_MONETARY -- cgit 1.4.1