* libioP.h: Only include libc-lock.h if _IO_MTSAFE_IO is defined.

From-SVN: r26980

* libioP.h: Only include libc-lock.h if _IO_MTSAFE_IO is defined.
From-SVN: r26980
74c1118e · Mark Kettenis · Jeff Law · ef4969e0 · 74c1118e · 74c1118e
Commit 74c1118e authored May 17, 1999 by Mark Kettenis Committed by Jeff Law May 17, 1999
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 6 deletions

libio/ChangeLog
+4 -0

libio/libioP.h
+9 -6

No files found.
--- a/libio/ChangeLog
+++ b/libio/ChangeLog
+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

--- 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"