aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--conform/data/stdlib.h-data2
-rw-r--r--conform/data/string.h-data4
3 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c4f11a4628..60aa5a7c28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2014-04-30 Joseph Myers <joseph@codesourcery.com>
+
+ * conform/data/stdlib.h-data [POSIX] (stddef.h): Do not allow
+ header inclusion.
+ [POSIX] (limits.h): Likewise.
+ [POSIX] (math.h): Likewise.
+ [POSIX] (sys/wait.h): Likewise.
+ * conform/data/string.h-data [POSIX || UNIX98] (strtok_r): Require
+ function.
+ [POSIX] (stddef.h): Do not allow header inclusion.
+
2014-04-30 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* sysdeps/generic/symbol-hacks.h (memcpy): Add internal alias.
diff --git a/conform/data/stdlib.h-data b/conform/data/stdlib.h-data
index 382fff66ba..abe296a2ab 100644
--- a/conform/data/stdlib.h-data
+++ b/conform/data/stdlib.h-data
@@ -177,7 +177,7 @@ function {void*} valloc (size_t)
function size_t wcstombs (char*, const wchar_t*, size_t)
function int wctomb (char*, wchar_t)
-#if !defined ISO && !defined ISO99 && !defined ISO11
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
allow-header stddef.h
allow-header limits.h
allow-header math.h
diff --git a/conform/data/string.h-data b/conform/data/string.h-data
index 365a5377a7..cc3b1c9732 100644
--- a/conform/data/string.h-data
+++ b/conform/data/string.h-data
@@ -53,7 +53,7 @@ function {char*} strsignal (int)
function size_t strspn (const char*, const char*)
function {char*} strstr (const char*, const char*)
function {char*} strtok (char*, const char*)
-#if defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008
+#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008
function {char*} strtok_r (char*, const char*, char**)
#endif
function size_t strxfrm (char*, const char*, size_t)
@@ -61,7 +61,7 @@ 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
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
allow-header stddef.h
#endif