From 69bd45bdbd422fadce2bd7a49db0f0adfb3ea9a2 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 27 Jan 2001 06:42:01 +0000
Subject: [PATCH] Update.

	* conform/data/stdio.h-data: Account for changes in XPG6.
---
 ChangeLog                 |  2 ++
 conform/data/stdio.h-data | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 76c3734996..3fc613a333 100644
--- 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 e00ebee68b..4349f8eec2 100644
--- 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