Rev all the header files to sync things with glibc 2.2.4

1 files changed, 393 insertions, 190 deletions

diff --git a/include/stdio.h b/include/stdio.h
index 25912ebaf..def468794 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,45 +1,59 @@
 /* Define ISO C stdio on top of C++ iostreams.
-   Copyright (C) 1991, 1994-1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1994-1999, 2000, 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 /*
- *	ISO C Standard: 4.9 INPUT/OUTPUT	<stdio.h>
+ *	ISO C99 Standard: 7.19 Input/output	<stdio.h>
  */
 
 #ifndef _STDIO_H
-#define _STDIO_H
 
-#include <features.h>
-#include <stdarg.h>
-#include <sys/types.h>
+#if !defined __need_FILE && !defined __need___FILE
+# define _STDIO_H	1
+# include <features.h>
 
 __BEGIN_DECLS
 
+# define __need_size_t
+# define __need_NULL
+# include <stddef.h>
+
+# include <bits/types.h>
+# define __need_FILE
+# define __need___FILE
+#endif /* Don't need FILE.  */
+#include <sys/types.h>
+
+
+#if !defined __FILE_defined && defined __need_FILE
+
+/* The opaque type of streams.  This is the definition used elsewhere.  */
 
 /* when you add or change fields here, be sure to change the initialization
  * in stdio_init and fopen */
-struct __stdio_file {
+struct _IO_FILE {
   unsigned char *bufpos;   /* the next byte to write to or read from */
   unsigned char *bufread;  /* the end of data returned by last read() */
   unsigned char *bufwrite; /* 1 + highest address writable by macro */
   unsigned char *bufstart; /* the start of the buffer */
   unsigned char *bufend;   /* the end of the buffer; ie the byte after the last
                               malloc()ed byte */
-  struct __stdio_file * next;
+  struct _IO_FILE * next;
 
   int fd; /* the file descriptor associated with the stream */
 
@@ -47,16 +61,37 @@ struct __stdio_file {
   unsigned char ungot;
   char unbuf[2];	   /* The buffer for 'unbuffered' streams */
 };
+typedef struct _IO_FILE FILE;
 
-typedef struct __stdio_file FILE;
+# define __FILE_defined	1
+#endif /* FILE not defined.  */
+#undef	__need_FILE
 
-/* Default buffer size.  */
-#define BUFSIZ	    (512)
 
-/* Define EOF and NULL */
-#define EOF	(-1)
-#ifndef NULL
-#define NULL	(0)
+#if !defined ____FILE_defined && defined __need___FILE
+
+/* The opaque type of streams.  This is the definition used elsewhere.  */
+typedef struct _IO_FILE __FILE;
+
+# define ____FILE_defined	1
+#endif /* __FILE not defined.  */
+#undef	__need___FILE
+
+
+#ifdef	_STDIO_H
+#undef _STDIO_USES_IOSTREAM
+
+#include <stdarg.h>
+typedef va_list _G_va_list;
+
+/* The type of the second argument to `fgetpos' and `fsetpos'.  */
+#ifndef __USE_FILE_OFFSET64
+typedef __off_t fpos_t;
+#else
+typedef __off64_t fpos_t;
+#endif
+#ifdef __USE_LARGEFILE64
+typedef __off64_t fpos64_t;
 #endif
 
 /* The possibilities for the third argument to `setvbuf'.  */
@@ -73,14 +108,33 @@ typedef struct __stdio_file FILE;
 #define __MODE_EOF		0x40	/* EOF status */
 #define __MODE_ERR		0x80	/* Error status */
 
+
+/* Default buffer size.  */
+#ifndef BUFSIZ
+# define BUFSIZ	    (512)
+#endif
+
+
+/* End of file character.
+   Some things throughout the library rely on this being -1.  */
+#ifndef EOF
+# define EOF (-1)
+#endif
+
+
 /* The possibilities for the third argument to `fseek'.
    These values should not be changed.  */
 #define SEEK_SET	0	/* Seek from beginning of file.  */
 #define SEEK_CUR	1	/* Seek from current position.  */
 #define SEEK_END	2	/* Seek from end of file.  */
 
+
+#if defined __USE_SVID || defined __USE_XOPEN
 /* Default path prefix for `tempnam' and `tmpnam'.  */
-#define P_tmpdir	"/tmp"
+# define P_tmpdir	"/tmp"
+#endif
+
+
 /* Get the values:
    L_tmpnam	How long an array of chars must be to be passed to `tmpnam'.
    TMP_MAX	The minimum number of unique filenames generated by tmpnam
@@ -90,9 +144,7 @@ typedef struct __stdio_file FILE;
    L_cuserid	How long an array to pass to `cuserid'.
    FOPEN_MAX	Minimum number of files that can be open at once.
    FILENAME_MAX	Maximum length of a filename.  */
-#define __need_FOPEN_MAX
 #include <bits/stdio_lim.h>
-#undef __need_FOPEN_MAX
 
 
 /* Standard streams.  */
@@ -105,23 +157,31 @@ extern FILE *stderr;		/* Standard error output stream.  */
 #define stderr stderr
 
 /* Remove file FILENAME.  */
-extern int remove __P ((__const char *__filename));
+extern int remove (__const char *__filename) __THROW;
 /* Rename file OLD to NEW.  */
-extern int rename __P ((__const char *__old, __const char *__new));
+extern int rename (__const char *__old, __const char *__new) __THROW;
 
 
 /* Create a temporary file and open it read/write.  */
-extern FILE *tmpfile __P ((void));
+#ifndef __USE_FILE_OFFSET64
+extern FILE *tmpfile (void) __THROW;
+#else
+# ifdef __REDIRECT
+extern FILE *__REDIRECT (tmpfile, (void) __THROW, tmpfile64);
+# else
+#  define tmpfile tmpfile64
+# endif
+#endif
 #ifdef __USE_LARGEFILE64
-extern FILE *tmpfile64 __P ((void));
+extern FILE *tmpfile64 (void) __THROW;
 #endif
 /* Generate a temporary filename.  */
-extern char *tmpnam __P ((char *__s));
+extern char *tmpnam (char *__s) __THROW;
 
 #ifdef __USE_MISC
 /* This is the reentrant variant of `tmpnam'.  The only difference is
    that it does not allow S to be NULL.  */
-extern char *tmpnam_r __P ((char *__s));
+extern char *tmpnam_r (char *__s) __THROW;
 #endif
 
 
@@ -133,170 +193,218 @@ extern char *tmpnam_r __P ((char *__s));
    If not and if DIR is not NULL, that value is checked.  If that fails,
    P_tmpdir is tried and finally "/tmp".  The storage for the filename
    is allocated by `malloc'.  */
-extern char *tempnam __P ((__const char *__dir, __const char *__pfx));
+extern char *tempnam (__const char *__dir, __const char *__pfx)
+     __THROW __attribute_malloc__;
 #endif
 
 
 /* Close STREAM.  */
-extern int fclose __P ((FILE *__stream));
+extern int fclose (FILE *__stream) __THROW;
 /* Flush STREAM, or all streams if STREAM is NULL.  */
-extern int fflush __P ((FILE *__stream));
-
-/* Open a file and create a new stream for it.  */
-extern FILE *fopen __P ((__const char *__restrict __filename,
-			 __const char *__restrict __mode));
-/* Open a file, replacing an existing stream with it. */
-extern FILE *freopen __P ((__const char *__restrict __filename,
-			   __const char *__restrict __mode,
-			   FILE *__restrict __stream));
+extern int fflush (FILE *__stream) __THROW;
 
 #ifdef __USE_MISC
-/*
- * Open a file using an automatically (stack) or statically allocated FILE.
- * The FILE * returned behaves just as any other FILE * with respect to the
- * stdio functions, but be aware of the following:
- * NOTE: The buffer used for the file is FILE's builtin 2-byte buffer, so
- *       setting a new buffer is probably advisable.
- * NOTE: This function is primarily intended to be used for stack-allocated
- *       FILEs when uClibc stdio has been built with no dynamic memory support.
- *       For the statically allocated case, it is probably better to increase
- *        the value of FIXED_STREAMS in stdio.c.
- * WARNING: If allocated on the stack, make sure you call fclose before the
- *          stack memory is reclaimed!
- */
-extern FILE *fsfopen __P ((__const char *__restrict __filename,
-			   __const char *__restrict __mode,
-			   FILE *__restrict __stream));
+/* Faster versions when locking is not required.  */
+extern int fflush_unlocked (FILE *__stream) __THROW;
+#endif
+
+#if 0
+//#ifdef __USE_GNU
+/* Close all streams.  */
+extern int fcloseall (void) __THROW;
 #endif
 
 
+#ifndef __USE_FILE_OFFSET64
+/* Open a file and create a new stream for it.  */
+extern FILE *fopen (__const char *__restrict __filename,
+		    __const char *__restrict __modes) __THROW;
+/* Open a file, replacing an existing stream with it. */
+extern FILE *freopen (__const char *__restrict __filename,
+		      __const char *__restrict __modes,
+		      FILE *__restrict __stream) __THROW;
+#else
+# ifdef __REDIRECT
+extern FILE *__REDIRECT (fopen, (__const char *__restrict __filename,
+				 __const char *__restrict __modes) __THROW,
+			 fopen64);
+extern FILE *__REDIRECT (freopen, (__const char *__restrict __filename,
+				   __const char *__restrict __modes,
+				   FILE *__restrict __stream) __THROW,
+			 freopen64);
+# else
+#  define fopen fopen64
+#  define freopen freopen64
+# endif
+#endif
 #ifdef __USE_LARGEFILE64
-extern FILE *fopen64 __P ((__const char *__restrict __filename,
-			   __const char *__restrict __mode));
-extern FILE *freopen64 __P ((__const char *__restrict __filename,
-			     __const char *__restrict __mode,
-			     FILE *__restrict __stream));
+extern FILE *fopen64 (__const char *__restrict __filename,
+		      __const char *__restrict __modes) __THROW;
+extern FILE *freopen64 (__const char *__restrict __filename,
+			__const char *__restrict __modes,
+			FILE *__restrict __stream) __THROW;
 #endif
 
 #ifdef	__USE_POSIX
 /* Create a new stream that refers to an existing system file descriptor.  */
-extern FILE *fdopen __P ((int __fd, __const char *__mode));
+extern FILE *fdopen (int __fd, __const char *__modes) __THROW;
 #endif
 
+#if 0
+//#ifdef	__USE_GNU
+/* Create a new stream that refers to the given magic cookie,
+   and uses the given functions for input and output.  */
+extern FILE *fopencookie (void *__restrict __magic_cookie,
+			  __const char *__restrict __modes,
+			  _IO_cookie_io_functions_t __io_funcs) __THROW;
+
+/* Create a new stream that refers to a memory buffer.  */
+extern FILE *fmemopen (void *__s, size_t __len, __const char *__modes) __THROW;
+
+/* Open a stream that writes into a malloc'd buffer that is expanded as
+   necessary.  *BUFLOC and *SIZELOC are updated with the buffer's location
+   and the number of characters written on fflush or fclose.  */
+extern FILE *open_memstream (char **__restrict __bufloc,
+			     size_t *__restrict __sizeloc) __THROW;
+#endif
 
-/* Make STREAM use buffering mode MODE.
-   If BUF is not NULL, use N bytes of it for buffering;
-   else allocate an internal buffer N bytes long.  */
-extern int setvbuf __P ((FILE *__restrict __stream, char *__restrict __buf,
-			 int __mode, size_t __n));
 
 /* If BUF is NULL, make STREAM unbuffered.
    Else make it use buffer BUF, of size BUFSIZ.  */
-extern void setbuf __P ((FILE *__restrict __stream, char *__restrict __buf));
+extern void setbuf (FILE *__restrict __stream, char *__restrict __buf) __THROW;
+/* Make STREAM use buffering mode MODE.
+   If BUF is not NULL, use N bytes of it for buffering;
+   else allocate an internal buffer N bytes long.  */
+extern int setvbuf (FILE *__restrict __stream, char *__restrict __buf,
+		    int __modes, size_t __n) __THROW;
 
 #ifdef	__USE_BSD
 /* If BUF is NULL, make STREAM unbuffered.
    Else make it use SIZE bytes of BUF for buffering.  */
-extern void setbuffer __P ((FILE *__restrict __stream, char *__restrict __buf,
-			    size_t __size));
+extern void setbuffer (FILE *__restrict __stream, char *__restrict __buf,
+		       size_t __size) __THROW;
 
 /* Make STREAM line-buffered.  */
-extern void setlinebuf __P ((FILE *__stream));
+extern void setlinebuf (FILE *__stream) __THROW;
 #endif
 
 
 /* Write formatted output to STREAM.  */
-extern int fprintf __P ((FILE *__restrict __stream,
-			 __const char *__restrict __format, ...));
+extern int fprintf (FILE *__restrict __stream,
+		    __const char *__restrict __format, ...) __THROW;
 /* Write formatted output to stdout.  */
-extern int printf __P ((__const char *__restrict __format, ...));
+extern int printf (__const char *__restrict __format, ...) __THROW;
 /* Write formatted output to S.  */
-extern int sprintf __P ((char *__restrict __s,
-			 __const char *__restrict __format, ...));
-
-/* Write formatted output to a file descriptor */
-extern int vdprintf __P((int fd, __const char *__restrict __format,
-						 va_list __arg));
-
-/* Write formatted output to a buffer S dynamically allocated by asprintf.  */
-extern int asprintf __P ((char **__restrict __s,
-			 __const char *__restrict __format, ...));
+extern int sprintf (char *__restrict __s,
+		    __const char *__restrict __format, ...) __THROW;
 
 /* Write formatted output to S from argument list ARG.  */
-extern int vfprintf __P ((FILE *__restrict __s,
-			  __const char *__restrict __format,
-			  va_list __arg));
+extern int vfprintf (FILE *__restrict __s, __const char *__restrict __format,
+		     _G_va_list __arg) __THROW;
 /* Write formatted output to stdout from argument list ARG.  */
-extern int vprintf __P ((__const char *__restrict __format,
-			 va_list __arg));
+extern int vprintf (__const char *__restrict __format, _G_va_list __arg)
+     __THROW;
 /* Write formatted output to S from argument list ARG.  */
-extern int vsprintf __P ((char *__restrict __s,
-			  __const char *__restrict __format,
-			  va_list __arg));
+extern int vsprintf (char *__restrict __s, __const char *__restrict __format,
+		     _G_va_list __arg) __THROW;
 
+#if defined __USE_BSD || defined __USE_ISOC99 || defined __USE_UNIX98
 /* Maximum chars of output to write in MAXLEN.  */
-extern int snprintf __P ((char *__restrict __s, size_t __maxlen,
-			  __const char *__restrict __format, ...))
-     __attribute__ ((__format__ (__printf__, 3, 4)));
-
-extern int __vsnprintf __P ((char *__restrict __s, size_t __maxlen,
-			     __const char *__restrict __format,
-			     va_list __arg))
-     __attribute__ ((__format__ (__printf__, 3, 0)));
-extern int vsnprintf __P ((char *__restrict __s, size_t __maxlen,
-			   __const char *__restrict __format,
-			   va_list __arg))
-     __attribute__ ((__format__ (__printf__, 3, 0)));
+extern int snprintf (char *__restrict __s, size_t __maxlen,
+		     __const char *__restrict __format, ...)
+     __THROW __attribute__ ((__format__ (__printf__, 3, 4)));
+
+extern int vsnprintf (char *__restrict __s, size_t __maxlen,
+		      __const char *__restrict __format, _G_va_list __arg)
+     __THROW __attribute__ ((__format__ (__printf__, 3, 0)));
+#endif
+
+#ifdef __USE_GNU
+/* Write formatted output to a string dynamically allocated with `malloc'.
+   Store the address of the string in *PTR.  */
+extern int vasprintf (char **__restrict __ptr, __const char *__restrict __f,
+		      _G_va_list __arg)
+     __THROW __attribute__ ((__format__ (__printf__, 2, 0)));
+extern int __asprintf (char **__restrict __ptr,
+		       __const char *__restrict __fmt, ...)
+     __THROW __attribute__ ((__format__ (__printf__, 2, 3)));
+extern int asprintf (char **__restrict __ptr,
+		     __const char *__restrict __fmt, ...)
+     __THROW __attribute__ ((__format__ (__printf__, 2, 3)));
+
+/* Write formatted output to a file descriptor.  */
+extern int vdprintf (int __fd, __const char *__restrict __fmt,
+		     _G_va_list __arg)
+     __THROW __attribute__ ((__format__ (__printf__, 2, 0)));
+extern int dprintf (int __fd, __const char *__restrict __fmt, ...)
+     __THROW __attribute__ ((__format__ (__printf__, 2, 3)));
+#endif
+
 
 /* Read formatted input from STREAM.  */
-extern int fscanf __P ((FILE *__restrict __stream,
-			__const char *__restrict __format, ...));
+extern int fscanf (FILE *__restrict __stream,
+		   __const char *__restrict __format, ...) __THROW;
 /* Read formatted input from stdin.  */
-extern int scanf __P ((__const char *__restrict __format, ...));
+extern int scanf (__const char *__restrict __format, ...) __THROW;
 /* Read formatted input from S.  */
-extern int sscanf __P ((__const char *__restrict __s,
-			__const char *__restrict __format, ...));
+extern int sscanf (__const char *__restrict __s,
+		   __const char *__restrict __format, ...) __THROW;
 
+#ifdef	__USE_ISOC99
 /* Read formatted input from S into argument list ARG.  */
-extern int vfscanf __P ((FILE *__restrict __s,
-			 __const char *__restrict __format,
-			 va_list __arg))
-     __attribute__ ((__format__ (__scanf__, 2, 0)));
+extern int vfscanf (FILE *__restrict __s, __const char *__restrict __format,
+		    _G_va_list __arg)
+     __THROW __attribute__ ((__format__ (__scanf__, 2, 0)));
 
 /* Read formatted input from stdin into argument list ARG.  */
-extern int vscanf __P ((__const char *__restrict __format, va_list __arg))
-     __attribute__ ((__format__ (__scanf__, 1, 0)));
+extern int vscanf (__const char *__restrict __format, _G_va_list __arg)
+     __THROW __attribute__ ((__format__ (__scanf__, 1, 0)));
 
 /* Read formatted input from S into argument list ARG.  */
-extern int vsscanf __P ((__const char *__restrict __s,
-			 __const char *__restrict __format,
-			 va_list __arg))
-     __attribute__ ((__format__ (__scanf__, 2, 0)));
+extern int vsscanf (__const char *__restrict __s,
+		    __const char *__restrict __format, _G_va_list __arg)
+     __THROW __attribute__ ((__format__ (__scanf__, 2, 0)));
+#endif /* Use ISO C9x.  */
 
 
 /* Read a character from STREAM.  */
-extern int fgetc __P ((FILE *__stream));
-extern int getc __P ((FILE *__stream));
+extern int fgetc (FILE *__stream) __THROW;
+extern int getc (FILE *__stream) __THROW;
 
 /* Read a character from stdin.  */
-extern int getchar __P ((void));
+extern int getchar (void) __THROW;
 
-/* The C standard explicitly says this is a macro, so be that way */
+/* The C standard explicitly says this is a macro, so we always do the
+   optimization for it.  */
 #define getc(stream)	\
   (((stream)->bufpos >= (stream)->bufread) ? fgetc(stream):		\
     (*(stream)->bufpos++))
+
 /* getchar() is equivalent to getc(stdin).  Since getc is a macro, 
  * that means that getchar() should be a macro too...  */
 #define getchar() getc(stdin)
 
+#if defined __USE_POSIX || defined __USE_MISC
+/* These are defined in POSIX.1:1996.  */
+extern int getc_unlocked (FILE *__stream) __THROW;
+extern int getchar_unlocked (void) __THROW;
+#endif /* Use POSIX or MISC.  */
+
+#ifdef __USE_MISC
+/* Faster version when locking is not necessary.  */
+extern int fgetc_unlocked (FILE *__stream) __THROW;
+#endif /* Use MISC.  */
+
+
 /* Write a character to STREAM.  */
-extern int fputc __P ((int __c, FILE *__stream));
-extern int putc __P ((int __c, FILE *__stream));
+extern int fputc (int __c, FILE *__stream) __THROW;
+extern int putc (int __c, FILE *__stream) __THROW;
 
 /* Write a character to stdout.  */
-extern int putchar __P ((int __c));
+extern int putchar (int __c) __THROW;
 
-/* The C standard explicitly says this can be a macro, so be that way */
+/* The C standard explicitly says this can be a macro,
+   so we always do the optimization for it.  */
 #define putc(c, stream)	\
     (((stream)->bufpos >= (stream)->bufwrite) ? fputc((c), (stream))	\
                           : (unsigned char) (*(stream)->bufpos++ = (c))	)
@@ -304,169 +412,264 @@ extern int putchar __P ((int __c));
  * that means that putchar() should be a macro too...  */
 #define putchar(c) putc((c), stdout)
 
+
+#ifdef __USE_MISC
+/* Faster version when locking is not necessary.  */
+extern int fputc_unlocked (int __c, FILE *__stream) __THROW;
+#endif /* Use MISC.  */
+
+#if defined __USE_POSIX || defined __USE_MISC
+/* These are defined in POSIX.1:1996.  */
+extern int putc_unlocked (int __c, FILE *__stream) __THROW;
+extern int putchar_unlocked (int __c) __THROW;
+#endif /* Use POSIX or MISC.  */
+
+
 #if defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN
 /* Get a word (int) from STREAM.  */
-extern int getw __P ((FILE *__stream));
+extern int getw (FILE *__stream) __THROW;
 
 /* Write a word (int) to STREAM.  */
-extern int putw __P ((int __w, FILE *__stream));
+extern int putw (int __w, FILE *__stream) __THROW;
 #endif
 
 
 /* Get a newline-terminated string of finite length from STREAM.  */
-extern char *fgets __P ((char *__restrict __s, int __n,
-			 FILE *__restrict __stream));
+extern char *fgets (char *__restrict __s, int __n, FILE *__restrict __stream)
+     __THROW;
+
+#if 0
+//#ifdef __USE_GNU
+/* This function does the same as `fgets' but does not lock the stream.  */
+extern char *fgets_unlocked (char *__restrict __s, int __n,
+			     FILE *__restrict __stream) __THROW;
+#endif
 
 /* Get a newline-terminated string from stdin, removing the newline.
    DO NOT USE THIS FUNCTION!!  There is no limit on how much it will read.  */
-extern char *gets __P ((char *__s));
+extern char *gets (char *__s) __THROW;
 
 
-#ifdef __USE_GNU
+#ifdef	__USE_GNU
 /* Read up to (and including) a DELIMITER from STREAM into *LINEPTR
    (and null-terminate it). *LINEPTR is a pointer returned from malloc (or
    NULL), pointing to *N characters of space.  It is realloc'd as
    necessary.  Returns the number of characters read (not including the
    null terminator), or -1 on error or EOF.  */
-extern ssize_t __getdelim __P ((char **__restrict __lineptr,
-				    size_t *__restrict __n, int __delimiter,
-				    FILE *__restrict __stream));
-extern ssize_t getdelim __P ((char **__restrict __lineptr,
-				  size_t *__restrict __n, int __delimiter,
-				  FILE *__restrict __stream));
+extern ssize_t __getdelim (char **__restrict __lineptr,
+			       size_t *__restrict __n, int __delimiter,
+			       FILE *__restrict __stream) __THROW;
+extern ssize_t getdelim (char **__restrict __lineptr,
+			     size_t *__restrict __n, int __delimiter,
+			     FILE *__restrict __stream) __THROW;
 
 /* Like `getdelim', but reads up to a newline.  */
-extern ssize_t getline __P ((char **__restrict __lineptr,
-				 size_t *__restrict __n,
-				 FILE *__restrict __stream));
+extern ssize_t getline (char **__restrict __lineptr,
+			    size_t *__restrict __n,
+			    FILE *__restrict __stream) __THROW;
 #endif
 
 
 /* Write a string to STREAM.  */
-extern int fputs __P ((__const char *__restrict __s,
-		       FILE *__restrict __stream));
+extern int fputs (__const char *__restrict __s, FILE *__restrict __stream)
+     __THROW;
+
+#if 0
+//#ifdef __USE_GNU
+/* This function does the same as `fputs' but does not lock the stream.  */
+extern int fputs_unlocked (__const char *__restrict __s,
+			   FILE *__restrict __stream) __THROW;
+#endif
 
 /* Write a string, followed by a newline, to stdout.  */
-extern int puts __P ((__const char *__s));
+extern int puts (__const char *__s) __THROW;
 
 
 /* Push a character back onto the input buffer of STREAM.  */
-extern int ungetc __P ((int __c, FILE *__stream));
+extern int ungetc (int __c, FILE *__stream) __THROW;
 
 
 /* Read chunks of generic data from STREAM.  */
-extern size_t fread __P ((void *__restrict __ptr, size_t __size,
-			  size_t __n, FILE *__restrict __stream));
+extern size_t fread (void *__restrict __ptr, size_t __size,
+		     size_t __n, FILE *__restrict __stream) __THROW;
 /* Write chunks of generic data to STREAM.  */
-extern size_t fwrite __P ((__const void *__restrict __ptr, size_t __size,
-			   size_t __n, FILE *__restrict __s));
+extern size_t fwrite (__const void *__restrict __ptr, size_t __size,
+		      size_t __n, FILE *__restrict __s) __THROW;
+
+#ifdef __USE_MISC
+/* Faster versions when locking is not necessary.  */
+extern size_t fread_unlocked (void *__restrict __ptr, size_t __size,
+			      size_t __n, FILE *__restrict __stream) __THROW;
+extern size_t fwrite_unlocked (__const void *__restrict __ptr, size_t __size,
+			       size_t __n, FILE *__restrict __stream) __THROW;
+#endif
 
-/* Rewind to the beginning of STREAM.  */
-extern void rewind __P ((FILE *__stream));
 
 /* Seek to a certain position on STREAM.  */
-extern int fseek __P ((FILE *__stream, long int __off, int __whence));
+extern int fseek (FILE *__stream, long int __off, int __whence) __THROW;
 /* Return the current position of STREAM.  */
-extern long int ftell __P ((FILE *__stream));
+extern long int ftell (FILE *__stream) __THROW;
+/* Rewind to the beginning of STREAM.  */
+extern void rewind (FILE *__stream) __THROW;
 
 /* The Single Unix Specification, Version 2, specifies an alternative,
    more adequate interface for the two functions above which deal with
    file offset.  `long int' is not the right type.  These definitions
    are originally defined in the Large File Support API.  */
 
-/* Types needed in these functions.  */
-#ifndef off_t
-typedef __off_t off_t;
-# define off_t off_t
-#endif
-
-#if defined __USE_LARGEFILE64 && !defined off64_t
-typedef __off64_t off64_t;
-# define off64_t off64_t
+#ifndef __USE_FILE_OFFSET64
+# ifdef __USE_LARGEFILE
+/* Seek to a certain position on STREAM.  */
+extern int fseeko (FILE *__stream, __off_t __off, int __whence) __THROW;
+/* Return the current position of STREAM.  */
+extern __off_t ftello (FILE *__stream) __THROW;
+# endif
+
+/* Get STREAM's position.  */
+extern int fgetpos (FILE *__restrict __stream, fpos_t *__restrict __pos)
+     __THROW;
+/* Set STREAM's position.  */
+extern int fsetpos (FILE *__stream, __const fpos_t *__pos) __THROW;
+#else
+# ifdef __REDIRECT
+#  ifdef __USE_LARGEFILE
+extern int __REDIRECT (fseeko,
+		       (FILE *__stream, __off64_t __off, int __whence) __THROW,
+		       fseeko64);
+extern __off64_t __REDIRECT (ftello, (FILE *__stream) __THROW, ftello64);
+#  endif
+extern int __REDIRECT (fgetpos, (FILE *__restrict __stream,
+				 fpos_t *__restrict __pos) __THROW, fgetpos64);
+extern int __REDIRECT (fsetpos,
+		       (FILE *__stream, __const fpos_t *__pos) __THROW,
+		       fsetpos64);
+# else
+#  ifdef __USE_LARGEFILE
+#   define fseeko fseeko64
+#   define ftello ftello64
+#  endif
+#  define fgetpos fgetpos64
+#  define fsetpos fsetpos64
+# endif
 #endif
 
-#ifndef fpos_t
-typedef off_t fpos_t;
-#define fpos_t fpos_t
+#ifdef __USE_LARGEFILE64
+extern int fseeko64 (FILE *__stream, __off64_t __off, int __whence) __THROW;
+extern __off64_t ftello64 (FILE *__stream) __THROW;
+extern int fgetpos64 (FILE *__restrict __stream, fpos64_t *__restrict __pos)
+     __THROW;
+extern int fsetpos64 (FILE *__stream, __const fpos64_t *__pos) __THROW;
 #endif
 
-/* Seek to a certain position on STREAM.  */
-extern int fsetpos __P((FILE *__stream, __const fpos_t *__pos));
-/* Return the current position of STREAM.  */
-extern int fgetpos __P((FILE *__stream, fpos_t *__pos));
-
 /* Clear the error and EOF indicators for STREAM.  */
-extern void clearerr __P ((FILE *__stream));
+extern void clearerr (FILE *__stream) __THROW;
 /* Return the EOF indicator for STREAM.  */
-extern int feof __P ((FILE *__stream));
+extern int feof (FILE *__stream) __THROW;
 /* Return the error indicator for STREAM.  */
-extern int ferror __P ((FILE *__stream));
+extern int ferror (FILE *__stream) __THROW;
+
+#ifdef __USE_MISC
+/* Faster versions when locking is not required.  */
+extern void clearerr_unlocked (FILE *__stream) __THROW;
+extern int feof_unlocked (FILE *__stream) __THROW;
+extern int ferror_unlocked (FILE *__stream) __THROW;
+#endif
+
 
 /* Print a message describing the meaning of the value of errno.  */
-extern void perror __P ((__const char *__s));
+extern void perror (__const char *__s) __THROW;
 
 /* These variables normally should not be used directly.  The `strerror'
    function provides all the needed functionality.  */
+#ifdef	__USE_BSD
 extern int sys_nerr;
 extern __const char *__const sys_errlist[];
+#endif
+#if 0
+//#ifdef	__USE_GNU
+extern int _sys_nerr;
+extern __const char *__const _sys_errlist[];
+#endif
+
 
 #ifdef	__USE_POSIX
 /* Return the system file descriptor for STREAM.  */
-extern int fileno __P ((FILE *__stream));
+extern int fileno (FILE *__stream) __THROW;
 /* Only use the macro below if you know fp is a valid FILE for a valid fd. */
 #define __fileno(fp)	((fp)->fd)
 #endif /* Use POSIX.  */
 
+#ifdef __USE_MISC
+/* Faster version when locking is not required.  */
+extern int fileno_unlocked (FILE *__stream) __THROW;
+#endif
+
+
 #if (defined __USE_POSIX2 || defined __USE_SVID  || defined __USE_BSD || \
      defined __USE_MISC)
 /* Create a new stream connected to a pipe running the given command.  */
-extern FILE *popen __P ((__const char *__command, __const char *__mode));
+extern FILE *popen (__const char *__command, __const char *__modes) __THROW;
 
 /* Close a stream opened by popen and return the status of its child.  */
-extern int pclose __P ((FILE *__stream));
+extern int pclose (FILE *__stream) __THROW;
 #endif
 
 
 #ifdef	__USE_POSIX
 /* Return the name of the controlling terminal.  */
-extern char *ctermid __P ((char *__s));
+extern char *ctermid (char *__s) __THROW;
 #endif /* Use POSIX.  */
 
 
 #ifdef __USE_XOPEN
 /* Return the name of the current user.  */
-extern char *cuserid __P ((char *__s));
-#endif /* Use X/Open.  */
+extern char *cuserid (char *__s) __THROW;
+#endif /* Use X/Open, but not issue 6.  */
+
+
+#if 0
+//#ifdef	__USE_GNU
+struct obstack;			/* See <obstack.h>.  */
+
+/* Write formatted output to an obstack.  */
+extern int obstack_printf (struct obstack *__restrict __obstack,
+			   __const char *__restrict __format, ...) __THROW;
+extern int obstack_vprintf (struct obstack *__restrict __obstack,
+			    __const char *__restrict __format,
+			    _G_va_list __args) __THROW;
+#endif /* Use GNU.  */
 
 
 #if defined __USE_POSIX || defined __USE_MISC
 /* These are defined in POSIX.1:1996.  */
 
 /* Acquire ownership of STREAM.  */
-extern void flockfile __P ((FILE *__stream));
+extern void flockfile (FILE *__stream) __THROW;
 
 /* Try to acquire ownership of STREAM but do not block if it is not
    possible.  */
-extern int ftrylockfile __P ((FILE *__stream));
+extern int ftrylockfile (FILE *__stream) __THROW;
 
 /* Relinquish the ownership granted for STREAM.  */
-extern void funlockfile __P ((FILE *__stream));
+extern void funlockfile (FILE *__stream) __THROW;
 #endif /* POSIX || misc */
 
-#if defined __USE_XOPEN && !defined __USE_GNU
+#if defined __USE_XOPEN && !defined __USE_XOPEN2K && !defined __USE_GNU
 /* The X/Open standard requires some functions and variables to be
    declared here which do not belong into this header.  But we have to
    follow.  In GNU mode we don't do this nonsense.  */
 # define __need_getopt
 # include <getopt.h>
-#endif
+#endif	/* X/Open, but not issue 6 and not for GNU.  */
 
 /* If we are compiling with optimizing read this file.  It contains
-   several optizing inline functions and macros.  */
+   several optimizing inline functions and macros.  */
 #ifdef __USE_EXTERN_INLINES
 # include <bits/stdio.h>
 #endif
 
 __END_DECLS
 
+#endif /* <stdio.h> included.  */
+
 #endif /* !_STDIO_H */