about summary refs log tree commit diff
path: root/conform/data/locale.h-data
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-05-09 10:04:19 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-05-09 10:05:14 +0000
commitb1cc2472d26084ec88b53606baabb82ec6b80db2 (patch)
treec276696e8d9c02714d1b8c93754dfd9b12678df3 /conform/data/locale.h-data
parente1b4354e663fe7f68c96b6c6e72e55492bf38b91 (diff)
downloadglibc-b1cc2472d26084ec88b53606baabb82ec6b80db2.tar.gz
glibc-b1cc2472d26084ec88b53606baabb82ec6b80db2.tar.xz
glibc-b1cc2472d26084ec88b53606baabb82ec6b80db2.zip
conformtest: Update expectations for more ISO C headers.
Diffstat (limited to 'conform/data/locale.h-data')
-rw-r--r--conform/data/locale.h-data22
1 files changed, 13 insertions, 9 deletions
diff --git a/conform/data/locale.h-data b/conform/data/locale.h-data
index 8897ee08a1..adcd25f656 100644
--- a/conform/data/locale.h-data
+++ b/conform/data/locale.h-data
@@ -26,15 +26,17 @@ element {struct lconv} char int_p_sep_by_space
 element {struct lconv} char int_p_sign_posn
 #endif
 
-constant NULL
+macro-constant NULL == 0
 
-macro LC_ALL
-macro LC_COLLATE
-macro LC_CTYPE
-macro LC_MESSAGES
-macro LC_MONETARY
-macro LC_NUMERIC
-macro LC_TIME
+macro-int-constant LC_ALL
+macro-int-constant LC_COLLATE
+macro-int-constant LC_CTYPE
+#if !defined ISO && !defined ISO99 && !defined ISO11
+macro-int-constant LC_MESSAGES
+#endif
+macro-int-constant LC_MONETARY
+macro-int-constant LC_NUMERIC
+macro-int-constant LC_TIME
 
 #if defined XOPEN2K8 || defined POSIX2008
 constant LC_GLOBAL_LOCALE
@@ -59,8 +61,10 @@ function locale_t newlocale (int, const char*, locale_t)
 function locale_t uselocale (locale_t)
 #endif
 
-allow LC_*
+allow LC_[ABCDEFGHIJKLMNOPQRSTUVWXYZ]*
+#if !defined ISO && !defined ISO99 && !defined ISO11
 allow *_t
+#endif
 #if defined XOPEN2K8 || defined POSIX2008
 allow LC_*_MASK
 #endif