diff options
author | Mark Kettenis <kettenis@gnu.org> | 1999-05-17 22:58:56 +0000 |
---|---|---|
committer | Jeff Law <law@gcc.gnu.org> | 1999-05-17 16:58:56 -0600 |
commit | 74c1118e9e84555430b3551d6722619e0c93c8b2 (patch) | |
tree | 27e87016d79b49b473585312b36d95c7b8d3c6ca | |
parent | ef4969e0b68c4219d0971cd1143f47b67fc52922 (diff) | |
download | gcc-74c1118e9e84555430b3551d6722619e0c93c8b2.zip gcc-74c1118e9e84555430b3551d6722619e0c93c8b2.tar.gz gcc-74c1118e9e84555430b3551d6722619e0c93c8b2.tar.bz2 |
* libioP.h: Only include libc-lock.h if _IO_MTSAFE_IO is defined.
From-SVN: r26980
-rw-r--r-- | libio/ChangeLog | 4 | ||||
-rw-r--r-- | libio/libioP.h | 15 |
2 files changed, 13 insertions, 6 deletions
diff --git a/libio/ChangeLog b/libio/ChangeLog index aa546a4..4bcc684 100644 --- a/libio/ChangeLog +++ b/libio/ChangeLog @@ -1,3 +1,7 @@ +1999-05-17 Mark Kettenis <kettenis@gnu.org> + + * libioP.h: Only include libc-lock.h if _IO_MTSAFE_IO is defined. + 1999-05-12 Jason Merrill <jason@yorick.cygnus.com> * configure.in (compiler_name): Don't do the skip-this-dir thing diff --git a/libio/libioP.h b/libio/libioP.h index 36fa1e0..629e4fd 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -31,14 +31,17 @@ #ifndef __set_errno # define __set_errno(Val) errno = (Val) #endif -#if defined __GLIBC__ && __GLIBC__ >= 2 -# if __GLIBC_MINOR__ > 0 -# include <bits/libc-lock.h> + +#ifdef _IO_MTSAFE_IO +# if defined __GLIBC__ && __GLIBC__ >= 2 +# if __GLIBC_MINOR__ > 0 +# include <bits/libc-lock.h> +# else +# include <libc-lock.h> +# endif # else -# include <libc-lock.h> -# endif -#else /*# include <comthread.h>*/ +# endif #endif #include "iolibio.h" |