diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-08-13 18:18:28 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-08-13 18:18:28 +0000 |
| commit | 319d719d86e2278ecca219c099c5d6d343a576a1 (patch) | |
| tree | 5359adefb397437feb7cf3e0c27cab895bc86cc7 /libio/iofopen.c | |
| parent | 8a82cc302401f7beea53f0395bbba2030ffe587a (diff) | |
| download | glibc-319d719d86e2278ecca219c099c5d6d343a576a1.tar.gz | |
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/iofopen.c')
| -rw-r--r-- | libio/iofopen.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libio/iofopen.c b/libio/iofopen.c index e44423be6d..f34fd1e515 100644 --- a/libio/iofopen.c +++ b/libio/iofopen.c @@ -27,7 +27,11 @@ #ifdef __STDC__ #include <stdlib.h> #endif -#include <shlib-compat.h> +#ifdef _LIBC +# include <shlib-compat.h> +#else +# define _IO_new_fopen fopen +#endif _IO_FILE * _IO_new_fopen (filename, mode) @@ -48,7 +52,11 @@ _IO_new_fopen (filename, mode) #ifdef _IO_MTSAFE_IO new_f->fp.file._lock = &new_f->lock; #endif +#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T _IO_no_init (&new_f->fp.file, 0, 0, &new_f->wd, &_IO_wfile_jumps); +#else + _IO_no_init (&new_f->fp.file, 1, 0, NULL, NULL); +#endif _IO_JUMPS (&new_f->fp) = &_IO_file_jumps; _IO_file_init (&new_f->fp); #if !_IO_UNIFIED_JUMPTABLES @@ -61,6 +69,8 @@ _IO_new_fopen (filename, mode) return NULL; } +#ifdef _LIBC strong_alias (_IO_new_fopen, __new_fopen) versioned_symbol (libc, _IO_new_fopen, _IO_fopen, GLIBC_2_1); versioned_symbol (libc, __new_fopen, fopen, GLIBC_2_1); +#endif |