aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-05-20 22:56:27 +0000
committerJoseph Myers <joseph@codesourcery.com>2015-05-20 22:56:27 +0000
commit38d3d5b7bdf251d5c549f5baef3ad5d2d144688a (patch)
tree704a286b1e1d0305defe7d5da25fa1002747b76a
parentbe8b8f1768a0a525767769cc6048c14e06c34fd7 (diff)
downloadglibc-38d3d5b7bdf251d5c549f5baef3ad5d2d144688a.tar
glibc-38d3d5b7bdf251d5c549f5baef3ad5d2d144688a.tar.gz
glibc-38d3d5b7bdf251d5c549f5baef3ad5d2d144688a.tar.bz2
glibc-38d3d5b7bdf251d5c549f5baef3ad5d2d144688a.zip
conformtest: correct POSIX expectations for locale.h.
When cleaning up conformtest expectations for POSIX for locale.h in <https://sourceware.org/ml/libc-alpha/2012-11/msg00382.html>, 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.
-rw-r--r--ChangeLog2
-rw-r--r--conform/data/locale.h-data2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 32eda8f961..d6a601200d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2015-05-20 Joseph Myers <joseph@codesourcery.com>
+ * 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