aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-07-16 13:49:59 +0000
committerUlrich Drepper <drepper@redhat.com>1998-07-16 13:49:59 +0000
commit08a0d60a9bc07a64b50f70160a633be938180595 (patch)
tree708125be3373f0c9901db0f2aaa0ce647ca97450
parent50304ef0572fb41ba853262046dc7594f6a15241 (diff)
downloadglibc-08a0d60a9bc07a64b50f70160a633be938180595.tar
glibc-08a0d60a9bc07a64b50f70160a633be938180595.tar.gz
glibc-08a0d60a9bc07a64b50f70160a633be938180595.tar.bz2
glibc-08a0d60a9bc07a64b50f70160a633be938180595.zip
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.
-rw-r--r--ChangeLog24
-rw-r--r--argp/argp-fmtstream.c1
-rw-r--r--assert/assert-perr.c1
-rw-r--r--assert/assert.c1
-rwxr-xr-xconfigure2
-rw-r--r--iconv/gconv_conf.c1
-rw-r--r--libio/iofputs_u.c1
-rw-r--r--malloc/mtrace.c1
-rw-r--r--malloc/obstack.c1
-rw-r--r--misc/error.c1
-rw-r--r--misc/syslog.c1
-rw-r--r--rt/aio_cancel.c5
-rw-r--r--stdio-common/asprintf.c1
-rw-r--r--stdio-common/dprintf.c1
-rw-r--r--stdio-common/getw.c1
-rw-r--r--stdio-common/putw.c1
-rw-r--r--stdio-common/snprintf.c1
-rw-r--r--stdio-common/sprintf.c1
-rw-r--r--stdio-common/sscanf.c1
-rw-r--r--sunrpc/svc_simple.c1
-rw-r--r--sysdeps/generic/abort.c1
-rw-r--r--sysdeps/unix/sysv/linux/bits/errno.h2
22 files changed, 45 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 8cbdff4e0e..8838385a80 100644
--- 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 e5acda68e6..05e9e21f06 100644
--- 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 ab6f55f7e2..5b84acef12 100644
--- 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 1640fb0e77..7a30f533c6 100644
--- 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 a989a2147c..541d53e6a1 100755
--- 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 0658f455ab..e58091a163 100644
--- 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 6fca3048eb..dfd91aba7e 100644
--- 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 40b3d74f3c..86f89540d4 100644
--- 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 f39b638f58..a192441a49 100644
--- 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 ac6de324dd..ca7f3b47b8 100644
--- 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 d025f672e0..a2becb43e7 100644
--- 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 e802a8533f..645ae16d04 100644
--- 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 56c49de4e1..5c2377d184 100644
--- 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 eddaea8cf8..6c3266d1df 100644
--- 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 03da6c3906..0305cbd46c 100644
--- 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 31cc00f41d..5c883186cd 100644
--- 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 08aaf88f18..d27ec5ecd5 100644
--- 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 0a0259ef0c..eaa4318b9c 100644
--- 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 809f059ef3..43a40701d8 100644
--- 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 405860e6c0..6f24dfa42a 100644
--- 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 91c504607a..e8157dd2e6 100644
--- 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 e3e8b3213d..35bd61109d 100644
--- 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. */