mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-21 22:51:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

libio.h (_IO_LOCK_T): Handle glibc 2 when _IO_MTSAFE_IO is not defined.

Browse Source 
* libio.h (_IO_LOCK_T): Handle glibc 2 when _IO_MTSAFE_IO is
        not defined.

        * iovsscanf.c (vsscanf): Make it weak alias of _IO_vsscanf if
        __linux__ is defined instead of __ELF__

        * config/linuxlibc1.mt (USER_INCLUDES): Add libio.h.
OK'd by Ulrich.

From-SVN: r16151
This commit is contained in:
H.J. Lu 1997-10-23 01:17:58 +00:00 committed by Jeff Law
parent 4966381af5
commit 1181d2d553
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libio/ChangeLog
View File

@ -1,3 +1,13 @@
Wed Oct 22 19:19:32 1997 H.J. Lu (hjl@gnu.ai.mit.edu)
* libio.h (_IO_LOCK_T): Handle glibc 2 when _IO_MTSAFE_IO is
not defined.
* iovsscanf.c (vsscanf): Make it weak alias of _IO_vsscanf if
__linux__ is defined instead of __ELF__
* config/linuxlibc1.mt (USER_INCLUDES): Add libio.h.
1997-10-15 Ulrich Drepper <drepper@cygnus.com>
* configure.in: Create compatibility code in bits/libc-lock.h file.

2
libio/config/linuxlibc1.mt
View File

@ -20,7 +20,7 @@ STDIO_OBJECTS=
USER_INCLUDES=PlotFile.h SFile.h builtinbuf.h editbuf.h fstream.h \
indstream.h iomanip.h iostream.h istream.h ostream.h \
parsestream.h pfstream.h procbuf.h stdiostream.h stream.h \
streambuf.h strfile.h strstream.h
streambuf.h strfile.h strstream.h libio.h
# A bad kludge
MT_CFLAGS=-D_G_HAVE_MMAP

2
libio/iovsscanf.c
View File

@ -52,7 +52,7 @@ _IO_vsscanf (string, format, args)
weak_alias (_IO_vsscanf, __vsscanf)
weak_alias (_IO_vsscanf, vsscanf)
#else
#ifdef __ELF__
#ifdef __linux__
#pragma weak vsscanf = _IO_vsscanf
#endif
#endif

10
libio/libio.h
View File

@ -157,15 +157,17 @@ struct _IO_jump_t; struct _IO_FILE;
# endif
#else
/* XXX This will go away as soon as comthread is finished. */
# ifdef __linux__
# if defined __GLIBC__ && __GLIBC__ >= 2
# define _IO_LOCK_T void *
# else
# ifdef __linux__
struct _IO_lock_t {
void *ptr;
short int field1;
short int field2;
};
# define _IO_LOCK_T struct _IO_lock_t
# else
typedef void _IO_lock_t;
# define _IO_LOCK_T struct _IO_lock_t
# endif
# endif
#endif