aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--include/stdio.h12
2 files changed, 12 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index f54baab..a334247 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-14 Ulrich Drepper <drepper@redhat.com>
+
+ * include/stdio.h: Remove references to old stdio implementation.
+
+ * libio/Makefile (bug-ungetwc2-ENV): Define.
+
2002-05-13 Roland McGrath <roland@frob.com>
* iconv/gconv_charset.h (upstr): Add inline keyword, quiets warning.
@@ -6,10 +12,10 @@
2002-05-13 Marcus Brinkmann <marcus@gnu.org>
- * hurd/hurdchdir.c (_hurd_change_directory_port_from_name):
- Allocate three, not two, more than LEN when appending '/.'.
- * sysdeps/mach/hurd/chroot.c (chroot): Likewise. Don't check
- if NAME ends with '/.' if it is shorter than 2 chars.
+ * hurd/hurdchdir.c (_hurd_change_directory_port_from_name):
+ Allocate three, not two, more than LEN when appending '/.'.
+ * sysdeps/mach/hurd/chroot.c (chroot): Likewise. Don't check
+ if NAME ends with '/.' if it is shorter than 2 chars.
2002-05-12 Roland McGrath <roland@frob.com>
diff --git a/include/stdio.h b/include/stdio.h
index 0eddd7d..e5228f2 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,13 +1,8 @@
#ifndef _STDIO_H
# if defined __need_FILE || defined __need___FILE
-# ifdef USE_IN_LIBIO
-# include <libio/stdio.h>
-# else
-# include <stdio/stdio.h>
-# endif
+# include <libio/stdio.h>
# else
-# ifdef USE_IN_LIBIO
-# include <libio/stdio.h>
+# include <libio/stdio.h>
/* Now define the internal interfaces. */
extern int __fcloseall (void);
@@ -36,9 +31,6 @@ extern FILE *__new_tmpfile (void);
extern FILE *__old_tmpfile (void);
-# else
-# include <stdio/stdio.h>
-# endif
# define __need_size_t
# include <stddef.h>