Update.

1999-08-21  Mark Kettenis  <kettenis@gnu.org>

	* stdio-common/vfscanf.c [! USE_IN_LIBIO]: Add necessary
	definitions for MEMCPY, ISSPACE, ISDIGIT, ISXDIGIT, TOLOWER, L_,
	CHAR_T, UCHAR_T and WIN_T to make the code compile again when
	stdio is used instead of libio.
	* stdio-common/vfprintf.c [! USE_IN_LIBIO]: Add necessary
	definitions for CHAR_T, UCHAR_T, INT_T, L_, ISDIGIT, PAD and PUTC
	to make the code compile again when stdio is used instead of
	libio.
	(vfprintf): Only check for correct orientation if ORIENT is
	defined.
	* stdio-common/Makefile (routines): Only add vfwprintf and
	vfwscanf if we're using libio.

1999-08-21  Mark Kettenis  <kettenis@gnu.org>

	* include/stdio.h [! USE_IN_LIBIO && __need_FILE]: Avoid defining
	any additional prototype just as we do for libio.

1999-08-21  Mark Kettenis  <kettenis@gnu.org>

	* include/bits/xopen_lim.h: Do not define STREAM_MAX and
	TZNAME_MAX.  These limits are not X/Open specific.
	* stdio-common/stdio_lim.h.in: Allow inclusion when __need_IOV_MAX
	is defined.

1999-08-21  Mark Kettenis  <kettenis@gnu.org>

	* Rules: When generated stdio_lim.h, avoid defining IOV_MAX if
	UIO_MAXIOV is left undefined in sys/uio.h.
	* stdio-common/stdio_lim.h.in: Adapt for change above.

1999-08-21  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/unix/sysv/linux/mips/bits/sigaction.h (SA_RESETHAND): Add it.
	* sysdeps/mips/bits/dlfcn.h: Remove SGI specific calls, add RTLD_LOCAL.
	Patches by Ralf Baechle <ralf@uni-koblenz.de>

2 files changed, 25 insertions, 23 deletions

diff --git a/include/bits/xopen_lim.h b/include/bits/xopen_lim.h
index 607c50b678..e1f0a440d0 100644
--- a/include/bits/xopen_lim.h
+++ b/include/bits/xopen_lim.h
@@ -45,9 +45,6 @@
    CHILD_MAX	Maximum number of simultaneous processes per real
 		user ID.
 
-   IOV_MAX	Maximum number of `iovec' structures that one process has
-		available for use with `readv' or writev'.
-
    OPEN_MAX	Maximum number of files that one process can have open
 		at anyone time.
 
@@ -55,13 +52,14 @@
    PAGE_SIZE	Size of bytes of a page.
 
    PASS_MAX	Maximum number of significant bytes in a password.
-*/
 
-/* The number of streams that one process can have open at one time.  */
-#define STREAM_MAX	FOPEN_MAX
+   We only provide a fixed limit for
 
-/* Maximum number of bytes supported for the name of a time zone.  */
-#define TZNAME_MAX	_POSIX_TZNAME_MAX
+   IOV_MAX	Maximum number of `iovec' structures that one process has
+		available for use with `readv' or writev'.
+
+   if this is indeed fixed by the underlying system.
+*/
 
 
 /* Maximum number of `iovec' structures that one process has available
diff --git a/include/stdio.h b/include/stdio.h
index eff125f476..5a80563906 100644
--- 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