[! USE_IN_LIBIO && __need_FILE]: Avoid defining any additional

prototype just as we do for libio.

diff --git a/include/stdio.h b/include/stdio.h
index eff125f..5a80563 100644 (file)
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,9 +1,13 @@
 #ifndef _STDIO_H
-#ifdef USE_IN_LIBIO
-#ifdef __need_FILE
-# include <libio/stdio.h>
-#else
-# include <libio/stdio.h>
+# ifdef __need_FILE
+#  ifdef USE_IN_LIBIO
+#   include <libio/stdio.h>
+#  else
+#   include <stdio/stdio.h>
+#  endif
+# else
+#  ifdef USE_IN_LIBIO
+#   include <libio/stdio.h>
 
 /* Now define the internal interfaces.  */
 extern int __fcloseall __P ((void));
@@ -24,13 +28,12 @@ extern int __vsscanf __P ((__const char *__restrict __s,
                           _G_va_list __arg))
      __attribute__ ((__format__ (__scanf__, 2, 0)));
 
-#endif
-#else
-#include <stdio/stdio.h>
-#endif
+#  else
+#   include <stdio/stdio.h>
+#  endif
 
-# define __need_size_t
-# include <stddef.h>
+#  define __need_size_t
+#  include <stddef.h>
 /* Generate a unique file name (and possibly open it).  */
 extern int __path_search __P ((char *__tmpl, size_t __tmpl_len,
                               __const char *__dir, __const char *__pfx,
@@ -38,14 +41,15 @@ extern int __path_search __P ((char *__tmpl, size_t __tmpl_len,
 
 extern int __gen_tempname __P ((char *__tmpl, int __kind));
 /* The __kind argument to __gen_tempname may be one of: */
-#define __GT_FILE      0       /* create a file */
-#define __GT_BIGFILE   1       /* create a file, using open64 */
-#define __GT_DIR       2       /* create a directory */
-#define __GT_NOCREATE  3       /* just find a name not currently in use */
+#  define __GT_FILE    0       /* create a file */
+#  define __GT_BIGFILE 1       /* create a file, using open64 */
+#  define __GT_DIR     2       /* create a directory */
+#  define __GT_NOCREATE        3       /* just find a name not currently in use */
 
 /* Print out MESSAGE on the error output and abort.  */
 extern void __libc_fatal __P ((__const char *__message))
      __attribute__ ((__noreturn__));
 
+# endif
 
 #endif