summary refs log tree commit diff
path: root/libio/stdio.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-08-13 18:18:28 +0000
committerUlrich Drepper <drepper@redhat.com>2000-08-13 18:18:28 +0000
commit319d719d86e2278ecca219c099c5d6d343a576a1 (patch)
tree5359adefb397437feb7cf3e0c27cab895bc86cc7 /libio/stdio.c
parent8a82cc302401f7beea53f0395bbba2030ffe587a (diff)
downloadglibc-319d719d86e2278ecca219c099c5d6d343a576a1.tar.gz
glibc-319d719d86e2278ecca219c099c5d6d343a576a1.tar.xz
glibc-319d719d86e2278ecca219c099c5d6d343a576a1.zip
Update.
2000-08-13  Ulrich Drepper  <drepper@redhat.com>
	    Benjamin Koznik  <bkoz@redhat.com>

	* libio/fileops.c: Merge with libstdc++-v3.
	* libio/genops.c: Likewise.
	* libio/iofclose.c: Likewise.
	* libio/iofopen.c: Likewise.
	* libio/iofwide.c: Likewise.
	* libio/libio.h: Likewise.
	* libio/libioP.h: Likewise.
	* libio/stdfiles.c: Likewise.
	* libio/stdio.c: Likewise.
	* libio/wfileops.c: Likewise.
	* libio/wgenops.c: Likewise.

	* libio/Versions: Export functions needed by libstdc++-v3 in GLIBC_2.2.
Diffstat (limited to 'libio/stdio.c')
-rw-r--r--libio/stdio.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libio/stdio.c b/libio/stdio.c
index 79d605de05..3b897ced17 100644
--- a/libio/stdio.c
+++ b/libio/stdio.c
@@ -29,13 +29,15 @@
 #undef stdin
 #undef stdout
 #undef stderr
-FILE *stdin = (FILE *) &_IO_2_1_stdin_;
-FILE *stdout = (FILE *) &_IO_2_1_stdout_;
-FILE *stderr = (FILE *) &_IO_2_1_stderr_;
+_IO_FILE *stdin = (FILE *) &_IO_2_1_stdin_;
+_IO_FILE *stdout = (FILE *) &_IO_2_1_stdout_;
+_IO_FILE *stderr = (FILE *) &_IO_2_1_stderr_;
 
 #undef _IO_stdin
 #undef _IO_stdout
 #undef _IO_stderr
+#ifdef _LIBC
 strong_alias (stdin, _IO_stdin);
 strong_alias (stdout, _IO_stdout);
 strong_alias (stderr, _IO_stderr);
+#endif