Update.

	* conform/data/stdio.h-data: Account for changes in XPG6.

diff --git a/ChangeLog b/ChangeLog
index 76c3734996d8f99f7ab822cee12fc85dec320a3b..3fc613a3331837eaf867dfe89f5f9a8fa5c6dbf0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2001-01-26  Ulrich Drepper  <drepper@redhat.com>
 
+       * conform/data/stdio.h-data: Account for changes in XPG6.
+
        * conform/data/spawn.h-data: Correct posix_spawnattr_setflags
        prototype.
 

diff --git a/conform/data/stdio.h-data b/conform/data/stdio.h-data
index e00ebee68b627b2ff494cae6895c83aaab3ade4c..4349f8eec233895fff4df8513f34a0c26549b1d3 100644 (file)
--- a/conform/data/stdio.h-data
+++ b/conform/data/stdio.h-data
@@ -62,7 +62,10 @@ function size_t fwrite (const void*, size_t, size_t, FILE*)
 function int getc (FILE*)
 function int getchar (void)
 function int getc_unlocked (FILE*)
+function int getchar_unlocked ()
+#ifndef XOPEN2K
 function int getopt (int, char *const[], const char *)
+#endif
 function {char*} gets (char*)
 function int getw (FILE*)
 function int pclose (FILE*)
@@ -89,15 +92,26 @@ function {FILE*} tmpfile (void)
 function {char*} tmpnam (char*)
 function int ungetc (int, FILE*)
 function int vfprintf (FILE*, const char*, va_list)
+#ifdef XOPEN2K
+function int vfscanf (FILE*, const char*, va_list)
+#endif
 function int vprintf (const char*, va_list)
+#ifdef XOPEN2K
+function int vscanf (const char*, va_list)
+#endif
 function int vsnprintf (char*, size_t, const char*, va_list)
 function int vsprintf (char*, const char*, va_list)
+#ifdef XOPEN2K
+function int vsscanf (const char*, const char*, va_list)
+#endif
 
 #if !defined ISO && !defined POSIX
+#ifndef XOPEN2K
 variable {char*} optarg
 variable int opterr
 variable int optind
 variable int optopt
+#endif
 
 allow-header stddef.h