summaryrefslogtreecommitdiff
path: root/conform
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2010-01-10 00:39:22 -0800
committerUlrich Drepper <drepper@redhat.com>2010-01-10 00:39:22 -0800
commitcd2f000c074b07931bd78ab5ff5fa3c0f7db628a (patch)
tree571f3ef9594371bdc13406a68fcd8b2befe57afc /conform
parent6651fa1216b5707b00668def26f43ee12b8cc59e (diff)
downloadglibc-cd2f000c074b07931bd78ab5ff5fa3c0f7db628a.tar.gz
Fix standalone stdio.h inclusion.
Diffstat (limited to 'conform')
-rw-r--r--conform/conformtest.pl19
-rw-r--r--conform/data/stdio.h-data3
2 files changed, 14 insertions, 8 deletions
diff --git a/conform/conformtest.pl b/conform/conformtest.pl
index e594d87972..c528127cee 100644
--- a/conform/conformtest.pl
+++ b/conform/conformtest.pl
@@ -56,14 +56,17 @@ $CFLAGS{"POSIX2008"} = "-I. -fno-builtin '-D__attribute__(x)=' -D_POSIX_C_SOURCE
# These are symbols which are known to pollute the namespace.
@knownproblems = ('unix', 'linux', 'i386');
-# Some headers need a bit more attention.
-$mustprepend{'inttypes.h'} = "#include <stddef.h>\n";
-$mustprepend{'regex.h'} = "#include <sys/types.h>\n";
-$mustprepend{'sched.h'} = "#include <sys/types.h>\n";
-$mustprepend{'signal.h'} = "#include <pthread.h>\n";
-$mustprepend{'stdio.h'} = "#include <sys/types.h>\n";
-$mustprepend{'wchar.h'} = "#include <stdarg.h>\n";
-$mustprepend{'wordexp.h'} = "#include <stddef.h>\n";
+if ($dialect ne "XOPEN2K8" && $dialect ne "POSIX2008") {
+ # Some headers need a bit more attention. At least with XPG7
+ # all headers should be self-contained.
+ $mustprepend{'inttypes.h'} = "#include <stddef.h>\n";
+ $mustprepend{'regex.h'} = "#include <sys/types.h>\n";
+ $mustprepend{'sched.h'} = "#include <sys/types.h>\n";
+ $mustprepend{'signal.h'} = "#include <pthread.h>\n";
+ $mustprepend{'stdio.h'} = "#include <sys/types.h>\n";
+ $mustprepend{'wchar.h'} = "#include <stdarg.h>\n";
+ $mustprepend{'wordexp.h'} = "#include <stddef.h>\n";
+}
# Make a hash table from this information.
while ($#keywords >= 0) {
diff --git a/conform/data/stdio.h-data b/conform/data/stdio.h-data
index fcc61c9df4..cba7721d9a 100644
--- a/conform/data/stdio.h-data
+++ b/conform/data/stdio.h-data
@@ -36,11 +36,14 @@ type va_list
type size_t
#if defined XOPEN2K8 || defined POSIX2008
type off_t
+type ssize_t
#endif
function void clearerr (FILE*)
function {char*} ctermid (char*)
+#if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
function {char*} cuserid (char*)
+#endif
#if defined XOPEN2K8 || defined POSIX2008
function int dprintf (int, const char*, ...)
#endif