Update.

1998-07-16 13:44  Ulrich Drepper  <drepper@cygnus.com>

	* argp/argp-fmtstream.c: Fix warnings introduced in last change.
	* assert/assert-perr.c: Likewise.
	* assert/assert.c: Likewise.
	* gconv_conf.c: Likewise.
	* libio/iofputs_u.c: Likewise.
	* malloc/mtrace.c: Likewise.
	* malloc/obstack.c: Likewise.
	* misc/error.c: Likewise.
	* misc/syslog.c: Likewise.
	* stdio-common/asprintf.c: Likewise.
	* stdio-common/dprintf.c: Likewise.
	* stdio-common/getw.c: Likewise.
	* stdio-common/putw.c: Likewise.
	* stdio-common/snprintf.c: Likewise.
	* stdio-common/sprintf.c: Likewise.
	* stdio-common/sscanf.c: Likewise.
	* sunrpc/svc_simple.c: Likewise.
	* sysdeps/generic/abort.c: Likewise.

	* rt/aio_cancel.c: Don't define ECANCELED here.
	* sysdeps/unix/sysv/linux/bits/errno.h: Define ECANCELED correctly.

diff --git a/ChangeLog b/ChangeLog
index 8cbdff4..8838385 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+1998-07-16 13:44  Ulrich Drepper  <drepper@cygnus.com>
+
+       * argp/argp-fmtstream.c: Fix warnings introduced in last change.
+       * assert/assert-perr.c: Likewise.
+       * assert/assert.c: Likewise.
+       * gconv_conf.c: Likewise.
+       * libio/iofputs_u.c: Likewise.
+       * malloc/mtrace.c: Likewise.
+       * malloc/obstack.c: Likewise.
+       * misc/error.c: Likewise.
+       * misc/syslog.c: Likewise.
+       * stdio-common/asprintf.c: Likewise.
+       * stdio-common/dprintf.c: Likewise.
+       * stdio-common/getw.c: Likewise.
+       * stdio-common/putw.c: Likewise.
+       * stdio-common/snprintf.c: Likewise.
+       * stdio-common/sprintf.c: Likewise.
+       * stdio-common/sscanf.c: Likewise.
+       * sunrpc/svc_simple.c: Likewise.
+       * sysdeps/generic/abort.c: Likewise.
+
+       * rt/aio_cancel.c: Don't define ECANCELED here.
+       * sysdeps/unix/sysv/linux/bits/errno.h: Define ECANCELED correctly.
+
 1998-07-16 10:23  Ulrich Drepper  <drepper@cygnus.com>
 
        * argp/argp-fmtstream.c: Unify names of used global functions.

diff --git a/argp/argp-fmtstream.c b/argp/argp-fmtstream.c
index e5acda6..05e9e21 100644 (file)
--- a/argp/argp-fmtstream.c
+++ b/argp/argp-fmtstream.c
@@ -41,6 +41,7 @@
 #endif
 
 #if defined _LIBC && defined USE_IN_LIBIO
+# include <libio/libioP.h>
 # define __vsnprintf(s, l, f, a) _IO_vsnprintf (s, l, f, a)
 #endif
 

diff --git a/assert/assert-perr.c b/assert/assert-perr.c
index ab6f55f..5b84ace 100644 (file)
--- a/assert/assert-perr.c
+++ b/assert/assert-perr.c
@@ -25,6 +25,7 @@
 extern const char *__assert_program_name; /* In assert.c.  */
 
 #ifdef USE_IN_LIBIO
+# include <libo/iolibio.h>
 # define fflush(s) _IO_fflush (s)
 #endif
 

diff --git a/assert/assert.c b/assert/assert.c
index 1640fb0..7a30f53 100644 (file)
--- a/assert/assert.c
+++ b/assert/assert.c
@@ -25,6 +25,7 @@
 const char *__assert_program_name;
 
 #ifdef USE_IN_LIBIO
+# include <libo/iolibio.h>
 # define fflush(s) _IO_fflush (s)
 #endif
 

diff --git a/configure b/configure
index a989a21..541d53e 100755 (executable)
--- a/configure
+++ b/configure
@@ -2279,7 +2279,7 @@ if test $VERSIONING = no; then
 *** WARNING: You should not compile GNU libc without versioning. Not using
 *** versioning will introduce incompatibilities so that old binaries
 *** will not run anymore.
-*** For versioning you need recent binutils (binutils-2.8.1.0.17 or newer)."
+*** For versioning you need recent binutils (binutils-2.8.1.0.23 or newer)."
 fi
 if test $elf = yes; then
   echo $ac_n "checking for .previous assembler directive""... $ac_c" 1>&6

diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
index 0658f45..e58091a 100644 (file)
--- a/iconv/gconv_conf.c
+++ b/iconv/gconv_conf.c
@@ -78,6 +78,7 @@ builtin_aliases[] =
 };
 
 #ifdef USE_IN_LIBIO
+# include <libio/libioP.h>
 # define __getdelim(line, len, c, fp) _IO_getdelim (line, len, c, fp)
 #endif
 

diff --git a/libio/iofputs_u.c b/libio/iofputs_u.c
index 6fca304..dfd91ab 100644 (file)
--- a/libio/iofputs_u.c
+++ b/libio/iofputs_u.c
@@ -24,6 +24,7 @@
    General Public License.  */
 
 #include "libioP.h"
+#include <stdio.h>
 #include <string.h>
 
 int

diff --git a/malloc/mtrace.c b/malloc/mtrace.c
index 40b3d74..86f8954 100644 (file)
--- a/malloc/mtrace.c
+++ b/malloc/mtrace.c
@@ -41,6 +41,7 @@ extern char *getenv ();
 #endif
 
 #if defined _LIBC && defined USE_IN_LIBIO
+# include <libio/iolibio.h>
 # define setvbuf(s, b, f, l) _IO_setvbuf (s, b, f, l)
 #endif
 

diff --git a/malloc/obstack.c b/malloc/obstack.c
index f39b638..a192441 100644 (file)
--- a/malloc/obstack.c
+++ b/malloc/obstack.c
@@ -460,6 +460,7 @@ _obstack_memory_used (h)
 # endif
 #endif
 #if defined _LIBC && defined USE_IN_LIBIO
+# include <libio/iolibio.h>
 # define fputs(s, f) _IO_fputs (s, f)
 #endif
 

diff --git a/misc/error.c b/misc/error.c
index ac6de32..ca7f3b4 100644 (file)
--- a/misc/error.c
+++ b/misc/error.c
@@ -77,6 +77,7 @@ unsigned int error_message_count;
 # define error_at_line __error_at_line
 
 # ifdef USE_IN_LIBIO
+# include <libio/iolibio.h>
 #  define fflush(s) _IO_fflush (s)
 # endif
 

diff --git a/misc/syslog.c b/misc/syslog.c
index d025f67..a2becb4 100644 (file)
--- a/misc/syslog.c
+++ b/misc/syslog.c
@@ -59,6 +59,7 @@ static char sccsid[] = "@(#)syslog.c  8.4 (Berkeley) 3/18/94";
 #endif
 
 #ifdef USE_IN_LIBIO
+# include <libio/iolibio.h>
 # define ftell(s) _IO_ftell (s)
 #endif
 

diff --git a/rt/aio_cancel.c b/rt/aio_cancel.c
index e802a85..645ae16 100644 (file)
--- a/rt/aio_cancel.c
+++ b/rt/aio_cancel.c
@@ -1,5 +1,5 @@
 /* Cancel requests associated with given file descriptor.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -34,9 +34,6 @@
 #include "aio_misc.h"
 
 
-/* Argh, so far there is no ECANCELED.  */
-#define ECANCELED 125
-
 int
 aio_cancel (fildes, aiocbp)
      int fildes;

diff --git a/stdio-common/asprintf.c b/stdio-common/asprintf.c
index 56c49de..5c2377d 100644 (file)
--- a/stdio-common/asprintf.c
+++ b/stdio-common/asprintf.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 
 #ifdef USE_IN_LIBIO
+# include <libio/libioP.h>
 # define vasprintf(s, f, a) _IO_vasprintf (s, f, a)
 #endif
 

diff --git a/stdio-common/dprintf.c b/stdio-common/dprintf.c
index eddaea8..6c3266d 100644 (file)
--- a/stdio-common/dprintf.c
+++ b/stdio-common/dprintf.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 
 #ifdef USE_IN_LIBIO
+# include <libio/libioP.h>
 # define vdprintf(d, f, a) _IO_vdprintf (d, f, a)
 #endif
 

diff --git a/stdio-common/getw.c b/stdio-common/getw.c
index 03da6c3..0305cbd 100644 (file)
--- a/stdio-common/getw.c
+++ b/stdio-common/getw.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 
 #ifdef USE_IN_LIBIO
+# include <libio/iolibio.h>
 # define fread(p, m, n, s) _IO_fread (p, m, n, s)
 #endif
 

diff --git a/stdio-common/putw.c b/stdio-common/putw.c
index 31cc00f..5c88318 100644 (file)
--- a/stdio-common/putw.c
+++ b/stdio-common/putw.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 
 #ifdef USE_IN_LIBIO
+# include <libio/iolibio.h>
 # define fwrite(p, n, m, s) _IO_fwrite (p, n, m, s)
 #endif
 

diff --git a/stdio-common/snprintf.c b/stdio-common/snprintf.c
index 08aaf88..d27ec5e 100644 (file)
--- a/stdio-common/snprintf.c
+++ b/stdio-common/snprintf.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 
 #ifdef USE_IN_LIBIO
+# include <libio/libioP.h>
 # define __vsnprintf(s, l, f, a) _IO_vsnprintf (s, l, f, a)
 #endif
 

diff --git a/stdio-common/sprintf.c b/stdio-common/sprintf.c
index 0a0259e..eaa4318 100644 (file)
--- a/stdio-common/sprintf.c
+++ b/stdio-common/sprintf.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 
 #ifdef USE_IN_LIBIO
+# include <libio/iolibio.h>
 # define vsprintf(s, f, a) _IO_vsprintf (s, f, a)
 #endif
 

diff --git a/stdio-common/sscanf.c b/stdio-common/sscanf.c
index 809f059..43a4070 100644 (file)
--- a/stdio-common/sscanf.c
+++ b/stdio-common/sscanf.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 
 #ifdef USE_IN_LIBIO
+# include <libio/iolibio.h>
 # define __vsscanf(s, f, a) _IO_vsscanf (s, f, a)
 #endif
 

diff --git a/sunrpc/svc_simple.c b/sunrpc/svc_simple.c
index 405860e..6f24dfa 100644 (file)
--- a/sunrpc/svc_simple.c
+++ b/sunrpc/svc_simple.c
@@ -46,6 +46,7 @@ static char sccsid[] = "@(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";
 #include <netdb.h>
 
 #ifdef USE_IN_LIBIO
+# include <libio/iolibio.h>
 # define fputs(s, f) _IO_fputs (s, f)
 #endif
 

diff --git a/sysdeps/generic/abort.c b/sysdeps/generic/abort.c
index 91c5046..e8157dd 100644 (file)
--- a/sysdeps/generic/abort.c
+++ b/sysdeps/generic/abort.c
@@ -32,6 +32,7 @@
 #endif
 
 #ifdef USE_IN_LIBIO
+# include <libo/iolibio.h>
 # define fflush(s) _IO_fflush (s)
 #endif
 

diff --git a/sysdeps/unix/sysv/linux/bits/errno.h b/sysdeps/unix/sysv/linux/bits/errno.h
index e3e8b32..35bd611 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/errno.h
+++ b/sysdeps/unix/sysv/linux/bits/errno.h
@@ -29,7 +29,7 @@
 
 /* Linux also has no ECANCELED error code.  Since it is not used here
    we define it to an invalid value.  */
-# define ECANCELED     (-1)
+# define ECANCELED     125
 
 # ifndef __ASSEMBLER__
 /* We now need a declaration of the `errno' variable.  */