conformtest: Update expectations for string.h

[Joseph S. Myers]

Continuing the review of conformtest data for ISO C standards, this
patch updates the data for string.h to correspond more accurately with
C90, C99 and C11 and to use conformtest features to describe as many
requirements of the standards on that header as possible.  Tested
x86_64.

2012-07-14  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.

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

-- 
Joseph S. Myers
joseph@codesourcery.com