about summary refs log tree commit diff
path: root/conform/data/stdio.h-data
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-11-19 22:20:44 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-11-19 22:20:44 +0000
commita483863fc136e1b066cb7886f0426df5e5dee73e (patch)
treee63403a6bcbadeb22eceb292f2018d158e20abab /conform/data/stdio.h-data
parent5ba924e3c7b54408050cbf8024279ce837b54e64 (diff)
downloadglibc-a483863fc136e1b066cb7886f0426df5e5dee73e.tar.gz
glibc-a483863fc136e1b066cb7886f0426df5e5dee73e.tar.xz
glibc-a483863fc136e1b066cb7886f0426df5e5dee73e.zip
conformtest: Clean up expectations for POSIX for various headers.
Diffstat (limited to 'conform/data/stdio.h-data')
-rw-r--r--conform/data/stdio.h-data12
1 files changed, 9 insertions, 3 deletions
diff --git a/conform/data/stdio.h-data b/conform/data/stdio.h-data
index ab55ce7bf9..9089180a10 100644
--- a/conform/data/stdio.h-data
+++ b/conform/data/stdio.h-data
@@ -9,7 +9,11 @@ macro-int-constant _IONBF
 #if !defined ISO && !defined ISO99 && !defined ISO11
 constant L_ctermid
 # if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
+#  ifdef POSIX
+optional-constant L_cuserid
+#  else
 constant L_cuserid
+#  endif
 # endif
 #endif
 macro-int-constant L_tmpnam
@@ -99,7 +103,7 @@ function int getc (FILE*)
 function int getchar (void)
 #if defined POSIX || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008
 function int getc_unlocked (FILE*)
-function int getchar_unlocked ()
+function int getchar_unlocked (void)
 #endif
 #if defined XOPEN2K8 || defined POSIX2008
 function ssize_t getdelim (char**, size_t*, int, FILE*)
@@ -174,15 +178,17 @@ function int vsprintf (char*, const char*, va_list)
 function int vsscanf (const char*, const char*, va_list)
 #endif
 
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
-#if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
+#if !defined ISO && !defined ISO99 && !defined ISO11
+#if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
 variable {char*} optarg
 variable int opterr
 variable int optind
 variable int optopt
 #endif
 
+#if !defined POSIX
 allow-header stddef.h
+#endif
 
 allow *_t
 #endif