From: Joseph Myers <joseph@codesourcery.com>
Date: Sun, 15 Jul 2012 22:38:11 +0000 (+0000)
Subject: conformtest: Update expectations for string.h.
X-Git-Tag: upstream/2.30~10589
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8048311a50ae9ca55adaba97c64e873dfdd41091;p=external%2Fglibc.git

conformtest: Update expectations for string.h.
---

diff --git a/ChangeLog b/ChangeLog
index 70d8b99..4c79b82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-07-15  Joseph Myers  <joseph@codesourcery.com>
+
+	* conform/data/string.h-data (NULL): Use macro-constant.  Require
+	equal to 0.
+	[ISO || ISO99 || ISO11] (stddef.h): Do not allow header.
+	(str*): Change to str[abcdefghijklmnopqrstuvwxyz]*.
+	(wcs*): Change to wcs[abcdefghijklmnopqrstuvwxyz]*.
+	(mem[abcdefghijklmnopqrstuvwxyz]*): Allow.
+	[ISO || ISO99 || ISO11] (*_t): Do not allow.
+
 2012-07-13  Andreas Jaeger  <aj@suse.de>
 
 	* po/fr.po: Update from translation team.
diff --git a/conform/data/string.h-data b/conform/data/string.h-data
index 0403c2e..365a537 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