about summary refs log tree commit diff
path: root/conform/data
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-07-15 22:38:11 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-07-15 22:38:11 +0000
commit8048311a50ae9ca55adaba97c64e873dfdd41091 (patch)
tree94fe250e2a2a158c5da75698e05bd96509939501 /conform/data
parentb637d46e7a900f516849487a5c4de734d4b3020d (diff)
downloadglibc-8048311a50ae9ca55adaba97c64e873dfdd41091.tar.gz
glibc-8048311a50ae9ca55adaba97c64e873dfdd41091.tar.xz
glibc-8048311a50ae9ca55adaba97c64e873dfdd41091.zip
conformtest: Update expectations for string.h.
Diffstat (limited to 'conform/data')
-rw-r--r--conform/data/string.h-data11
1 files changed, 8 insertions, 3 deletions
diff --git a/conform/data/string.h-data b/conform/data/string.h-data
index 0403c2e328..365a5377a7 100644
--- a/conform/data/string.h-data
+++ b/conform/data/string.h-data
@@ -1,4 +1,4 @@
-constant NULL
+macro-constant NULL == 0
 
 type size_t
 #if defined XOPEN2K8 || defined POSIX2008
@@ -61,8 +61,13 @@ function size_t strxfrm (char*, const char*, size_t)
 function size_t strxfrm_l (char*, const char*, size_t, locale_t)
 #endif
 
+#if !defined ISO && !defined ISO99 && !defined ISO11
 allow-header stddef.h
+#endif
 
-allow str*
-allow wcs*
+allow str[abcdefghijklmnopqrstuvwxyz]*
+allow mem[abcdefghijklmnopqrstuvwxyz]*
+allow wcs[abcdefghijklmnopqrstuvwxyz]*
+#if !defined ISO && !defined ISO99 && !defined ISO11
 allow *_t
+#endif