diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1997-10-13 01:27:24 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1997-10-13 01:27:24 +0000 |
| commit | 1ea89a402d892b68b193e2e4390d8eb33ed686e7 (patch) | |
| tree | 5e14832655316159895c8ee546fd73e4c1a72914 /libio/iofopen.c | |
| parent | dfd2257ad98eb0f6eab167e5fe5ff68ca87172e3 (diff) | |
| download | glibc-1ea89a402d892b68b193e2e4390d8eb33ed686e7.tar glibc-1ea89a402d892b68b193e2e4390d8eb33ed686e7.tar.gz glibc-1ea89a402d892b68b193e2e4390d8eb33ed686e7.tar.bz2 glibc-1ea89a402d892b68b193e2e4390d8eb33ed686e7.zip | |
Update.cvs/libc-ud-971012
1997-10-13 03:14 Ulrich Drepper <drepper@cygnus.com>
* libc.map: Move _IO_fopen, fopen, _IO_stdin_, _IO_stdout_,
_IO_stderr_, _IO_list_all, and freopen to GLIBC_2.1 version.
* include/libc-symbol.h: Define define_symbol.
* libio/Makefile [$(versioning)=yes] (routines): Add oldiofopen and
oldfreopen.
[$(versioning)=yes] (aux): Add oldfileops and oldstdfiles.
* libio/fileops.c: Use _IO_FILE_complete when accessing _offset field.
* libio/freopen.c: Use versioning.
* libio/iofopen.c: Likewise. Generate object of type
_IO_FILE_complete.
* libio/iofopen64.c: Generate object of type _IO_FILE_complete.
* libio/iolibio.h: Declare _IO_{old,new}_fopen and __{old,new}_freopen.
Define _IO_old_freopen.
* libio/libio.h: Remove _offset field from _IO_FILE. Rename _unused2
field to _old_offset. Declare _IO_std*_ streams as of type
_IO_FILE_complete.
* libio/libioP.h: Define _IO_FILE_complete.
Declare callbacks for old fileops implementation.
* libio/stdfile.c: Define standard stream of type _IO_FILE_complete.
* libio/stdio.c: Correctly address FILE part of standard streams.
* libio/oldfileops.c: New file.
* libio/oldfreopen.c: New file.
* libio/oldiofopen.c: New file.
* libio/oldstdfiles.c: New file.
* sysdeps/i386/fpu/bits/mathinline.h: Define fma optimization.
* sysdeps/libm-i387/e_scalb.S: Make sure code gets into .text section.
* sysdeps/libm-i387/e_scalbl.S: Likewise.
* sysdeps/libm-i387/s_fma.S: Fix typo.
* sysdeps/libm-i387/s_fmaf.S: Likewise.
* sysdeps/libm-i387/s_fmal.S: Likewise.
1997-10-12 20:14 Zack Weinberg <zack@rabi.phys.columbia.edu>
* sysdeps/stub/getsid.c: Add a stub_warning.
* sysdeps/stub/mmap.c: Likewise.
* sysdeps/stub/munmap.c: Likewise.
* sysdeps/libm-ieee754/s_fma.c: New file.
* sysdeps/libm-ieee754/s_fmaf.c: New file.
* sysdeps/libm-ieee754/s_fmal.c: New file.
* sysdeps/libm-ieee754/s_llrintf.c: New file.
* sysdeps/libm-ieee754/s_llrintl.c: New file.
* sysdeps/libm-ieee754/s_lrintf.c: New file.
* sysdeps/libm-ieee754/s_lrintl.c: New file.
Diffstat (limited to 'libio/iofopen.c')
| -rw-r--r-- | libio/iofopen.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/libio/iofopen.c b/libio/iofopen.c index 5019e9a798..c27b69bc1b 100644 --- a/libio/iofopen.c +++ b/libio/iofopen.c @@ -29,13 +29,13 @@ #endif _IO_FILE * -_IO_fopen (filename, mode) +_IO_new_fopen (filename, mode) const char *filename; const char *mode; { struct locked_FILE { - struct _IO_FILE_plus fp; + struct _IO_FILE_complete fp; #ifdef _IO_MTSAFE_IO _IO_lock_t lock; #endif @@ -44,21 +44,28 @@ _IO_fopen (filename, mode) if (new_f == NULL) return NULL; #ifdef _IO_MTSAFE_IO - new_f->fp.file._lock = &new_f->lock; + new_f->fp.plus.file._lock = &new_f->lock; #endif - _IO_init (&new_f->fp.file, 0); - _IO_JUMPS (&new_f->fp.file) = &_IO_file_jumps; - _IO_file_init (&new_f->fp.file); + _IO_init (&new_f->fp.plus.file, 0); + _IO_JUMPS (&new_f->fp.plus.file) = &_IO_file_jumps; + _IO_file_init (&new_f->fp.plus.file); #if !_IO_UNIFIED_JUMPTABLES - new_f->fp.vtable = NULL; + new_f->fp.plus.vtable = NULL; #endif - if (_IO_file_fopen (&new_f->fp.file, filename, mode, 0) != NULL) - return (_IO_FILE *) &new_f->fp; - _IO_un_link (&new_f->fp.file); + if (_IO_file_fopen (&new_f->fp.plus.file, filename, mode, 0) != NULL) + return (_IO_FILE *) &new_f->fp.plus; + _IO_un_link (&new_f->fp.plus.file); free (new_f); return NULL; } -#ifdef weak_alias -weak_alias (_IO_fopen, fopen) +#ifdef DO_VERSIONING +strong_alias (_IO_new_fopen, __new_fopen) +symbol_version (_IO_new_fopen, _IO_fopen, GLIBC_2.1); +symbol_version (__new_fopen, fopen, GLIBC_2.1); +#else +# ifdef weak_alias +weak_symbol (_IO_new_fopen, _IO_fopen) +weak_symbol (_IO_new_fopen, fopen) +# endif #endif |