diff options
| author | H.J. Lu <hjl@gnu.ai.mit.edu> | 1997-10-23 01:17:58 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1997-10-22 19:17:58 -0600 |
| commit | 1181d2d55377707551ac43b20ca7ebb4e253dddc (patch) | |
| tree | 8a86fdd90a3b0a82e0d6c72cbc99059eaa1e6533 /libio/libio.h | |
| parent | 4966381af5a597dd1cf0f4f73b70d12f5d17be13 (diff) | |
| download | gcc-1181d2d55377707551ac43b20ca7ebb4e253dddc.zip gcc-1181d2d55377707551ac43b20ca7ebb4e253dddc.tar.gz gcc-1181d2d55377707551ac43b20ca7ebb4e253dddc.tar.bz2 | |
libio.h (_IO_LOCK_T): Handle glibc 2 when _IO_MTSAFE_IO is not defined.
* 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
Diffstat (limited to 'libio/libio.h')
| -rw-r--r-- | libio/libio.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libio/libio.h b/libio/libio.h index 98d98c3..eeee6ce 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -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 |