3 files changed, 42 insertions, 1 deletions
diff --git a/conform/conformtest.pl b/conform/conformtest.pl
index 518122f645..08b46c1bf1 100644
--- a/conform/conformtest.pl
+++ b/conform/conformtest.pl
@@ -4,7 +4,7 @@ $CC = "gcc";
 $CFLAGS = "-I. '-D__attribute__(x)=' -D_XOPEN_SOURCE=500";
 
 # List of the headers we are testing.
-@headers = ("stdlib.h", "stdio.h",
+@headers = ("strings.h", "string.h", "stdlib.h", "stdio.h",
 	    "stddef.h", "stdarg.h", "signal.h", "setjmp.h", "semaphore.h",
 	    "search.h", "sched.h", "regex.h", "pwd.h", "pthread.h",
 	    "poll.h", "nl_types.h", "ndbm.h", "mqueue.h", "monetary.h",
diff --git a/conform/data/string.h-data b/conform/data/string.h-data
new file mode 100644
index 0000000000..fe27c8ab61
--- /dev/null
+++ b/conform/data/string.h-data
@@ -0,0 +1,31 @@
+constant NULL
+
+type size_t
+
+function {void*} memccpy (void*, const void*, int, size_t)
+function {void*} memchr (const void*, int, size_t)
+function int memcmp (const void*, const void*, size_t)
+function {void*} memcpy (void*, const void*, size_t)
+function {void*} memmove (void*, const void*, size_t)
+function {void*} memset (void*, int, size_t)
+function {char*} strcat (char*, const char*)
+function {char*} strchr (const char*, int)
+function int strcmp (const char*, const char*)
+function int strcoll (const char*, const char*)
+function {char*} strcpy (char*, const char*)
+function size_t strcspn (const char*, const char*)
+function {char*} strdup (const char*)
+function {char*} strerror (int)
+function size_t strlen (const char*)
+function {char*} strncat (char*, const char*, size_t)
+function int strncmp (const char*, const char*, size_t)
+function {char*} strncpy (char*, const char*, size_t)
+function {char*} strpbrk (const char*, const char*)
+function {char*} strrchr (const char*, int)
+function size_t strspn (const char*, const char*)
+function {char*} strstr (const char*, const char*)
+function {char*} strtok (char*, const char*)
+function {char*} strtok_r (char*, const char*, char**)
+function size_t strxfrm (char*, const char*, size_t)
+
+allow-header stddef.h
diff --git a/conform/data/strings.h-data b/conform/data/strings.h-data
new file mode 100644
index 0000000000..7d7d67e9ce
--- /dev/null
+++ b/conform/data/strings.h-data
@@ -0,0 +1,10 @@
+function int bcmp (const void*, const void*, size_t)
+function void bcopy (const void*, void*, size_t)
+function void bzero (void*, size_t)
+function int ffs (int)
+function {char*} index (const char*, int)
+function {char*} rindex (const char*, int)
+function int strcasecmp (const char*, const char*)
+function int strncasecmp (const char*, const char*, size_t)
+
+type size_t