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 8cbdff4e0e65f009abec670724619149ad85c54d..8838385a80da3a54619cf12584fa36afc2f81b3a 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 e5acda68e699f8325cfafe8afa90cf2fa0dbd193..05e9e21f06f463f9849337e854f0b30d41349f6a 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 ab6f55f7e2992e255b6ea688e618b2e217acacf3..5b84acef12066ac171332cafd50e31947591c0d6 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 1640fb0e77e8c95cc939fbb36c046c2d632bb1b4..7a30f533c6bb5bda3d2dde0c50d14b35bac8e633 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 a989a2147c27c3f643e01222a95423a4243f10d7..541d53e6a169915e8992e5df04be73ed5498f28a 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 0658f455abacac48000729020ff5b389320fd38d..e58091a16349b341c00f27236bc74e56fc123858 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 6fca3048eb3f7d19612fb0eb2a4488ed1f445900..dfd91aba7e6f20a28f2050885dbdb7333885dc08 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 40b3d74f3c074d2a4bd9e434b558a2e5b80c30ce..86f89540d4b27da3b49cd8c268be5af3871bbabf 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 f39b638f58151f2c5fa6358d1d264257a9727da7..a192441a4961fdb153bd21572dc8e74f3bd7d982 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 ac6de324dd1eaefaae3fa02117f6be2c1fc07eb8..ca7f3b47b8896d296a889058f43fc38e80002ef3 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 d025f672e05412487a7b67935f3e37dd9fb68872..a2becb43e7c16dc5bf24c0f7e199dcb38cb98160 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 e802a8533f8f5a86af01583ef47ed92971cfbbaf..645ae16d0480f78b01f90b44e53fc64e41b078bb 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 56c49de4e1a58b384af58a336819ad8e29a967a8..5c2377d184d05b960a6d327e8482475fe4df3707 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 eddaea8cf884ecfc66db30bdc24387f0246a70b4..6c3266d1dffab11dbc59537e06cbacb22761aab3 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 03da6c3906b6163deb91c0de156baeb4a787ad69..0305cbd46c1dcbdcb900f00e70dac036bb48a85c 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 31cc00f41de25624d2c173af5701cd7be9e64c82..5c883186cd3d929531d34d7e31cc2f7115bd09e4 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 08aaf88f18dc36c8e76b1c0b3e18c33e14c1f8fd..d27ec5ecd5230f1bdfe335061c638252e572b4bc 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 0a0259ef0c76d6350a0e665656b0b3dc5d1830b0..eaa4318b9cc8da1ecd21a25a9ccc5edfd9273193 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 809f059ef3a35cb1b4ef9a9a752b93088e9082a5..43a40701d8d19fbbe6dbff13bee3ec3979a6bd92 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 405860e6c04d3d2b0a4e2a5fd4ef618d0114c6cf..6f24dfa42a14c21a4d6f1dc6e3a36b4b4fb16d6a 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 91c504607a8be364e7a7e761e9c4a8ece5af969e..e8157dd2e6d37996772b5658b286e294726985ea 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 e3e8b3213d029208be6cd4cf85fdf1d910fe5cd6..35bd61109deea7c15ed7f033eb18c30f35fbc61c 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.  */