* intrinsics/ierrno.c: Don't include "io/io.h".

	* intrinsics/sleep.c: Likewise.
	* intrinsics/perror.c: Likewise.
	* intrinsics/stat.c: Likewise.
	* intrinsics/kill.c: Likewise.
	* intrinsics/time.c: Likewise.
	* intrinsics/fnum.c: Likewise.
	* intrinsics/rename.c: Likewise.
	* intrinsics/symlnk.c: Likewise.
	* intrinsics/chdir.c: Likewise.
	* intrinsics/link.c: Likewise.
	* intrinsics/random.c: Don't include "io/io.h". Include	<gthr.h>.
	* intrinsics/rand.c: Likewise.


git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@114962 138bc75d-0d04-0410-961f-82ee72b054a4

14 files changed, 18 insertions, 24 deletions

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 0474b08b64a..cf5860414d0 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,5 +1,21 @@
 2006-06-24  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
 
+	* intrinsics/ierrno.c: Don't include "io/io.h".
+	* intrinsics/sleep.c: Likewise.
+	* intrinsics/perror.c: Likewise.
+	* intrinsics/stat.c: Likewise.
+	* intrinsics/kill.c: Likewise.
+	* intrinsics/time.c: Likewise.
+	* intrinsics/fnum.c: Likewise.
+	* intrinsics/rename.c: Likewise.
+	* intrinsics/symlnk.c: Likewise.
+	* intrinsics/chdir.c: Likewise.
+	* intrinsics/link.c: Likewise.
+	* intrinsics/random.c: Don't include "io/io.h". Include	<gthr.h>.
+	* intrinsics/rand.c: Likewise.
+
+2006-06-24  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
 	PR fortran/28094
 	* Makefile.am: Add _mod_r10.F90 and _mod_r16.F90.
 	* Makefile.in: Regenerate.
diff --git a/libgfortran/intrinsics/chdir.c b/libgfortran/intrinsics/chdir.c
index eaa83780ea0..e365a6afed8 100644
--- a/libgfortran/intrinsics/chdir.c
+++ b/libgfortran/intrinsics/chdir.c
@@ -33,8 +33,6 @@ Boston, MA 02110-1301, USA.  */
 
 #include <errno.h>
 
-#include "../io/io.h"
-
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
diff --git a/libgfortran/intrinsics/fnum.c b/libgfortran/intrinsics/fnum.c
index 1311856c8c1..02a6bb5e169 100644
--- a/libgfortran/intrinsics/fnum.c
+++ b/libgfortran/intrinsics/fnum.c
@@ -31,8 +31,6 @@ Boston, MA 02110-1301, USA.  */
 #include "config.h"
 #include "libgfortran.h"
 
-#include "../io/io.h"
-
 /* FUNCTION FNUM(UNIT)
    INTEGER FNUM
    INTEGER, INTENT(IN), :: UNIT  */
diff --git a/libgfortran/intrinsics/ierrno.c b/libgfortran/intrinsics/ierrno.c
index 2e30caa2b3a..4b0c6da8edc 100644
--- a/libgfortran/intrinsics/ierrno.c
+++ b/libgfortran/intrinsics/ierrno.c
@@ -33,8 +33,6 @@ Boston, MA 02110-1301, USA.  */
 
 #include <errno.h>
 
-#include "../io/io.h"
-
 
 /* INTEGER FUNCTION IERRNO()  */
 
diff --git a/libgfortran/intrinsics/kill.c b/libgfortran/intrinsics/kill.c
index 3df830cd4c8..0c25f1ba17b 100644
--- a/libgfortran/intrinsics/kill.c
+++ b/libgfortran/intrinsics/kill.c
@@ -41,8 +41,6 @@ Boston, MA 02110-1301, USA.  */
 
 #include <errno.h>
 
-#include "../io/io.h"
-
 /* SUBROUTINE KILL(PID, SIGNAL, STATUS)
    INTEGER, INTENT(IN) :: PID, SIGNAL
    INTEGER(KIND=1), INTENT(OUT), OPTIONAL :: STATUS
diff --git a/libgfortran/intrinsics/link.c b/libgfortran/intrinsics/link.c
index 3ddebf3f4dc..4627d47d02d 100644
--- a/libgfortran/intrinsics/link.c
+++ b/libgfortran/intrinsics/link.c
@@ -33,8 +33,6 @@ Boston, MA 02110-1301, USA.  */
 
 #include <errno.h>
 
-#include "../io/io.h"
-
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
diff --git a/libgfortran/intrinsics/perror.c b/libgfortran/intrinsics/perror.c
index 96edc9bcf3e..823ee485ca9 100644
--- a/libgfortran/intrinsics/perror.c
+++ b/libgfortran/intrinsics/perror.c
@@ -34,8 +34,6 @@ Boston, MA 02110-1301, USA.  */
 #include <stdio.h>
 #include <errno.h>
 
-#include "../io/io.h"
-
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
diff --git a/libgfortran/intrinsics/rand.c b/libgfortran/intrinsics/rand.c
index 7af525e7d2a..2cc6b817989 100644
--- a/libgfortran/intrinsics/rand.c
+++ b/libgfortran/intrinsics/rand.c
@@ -37,7 +37,7 @@ Boston, MA 02110-1301, USA.  */
 
 #include "config.h"
 #include "libgfortran.h"
-#include "../io/io.h"
+#include <gthr.h>
 
 #define GFC_RAND_A	16807
 #define GFC_RAND_M	2147483647
diff --git a/libgfortran/intrinsics/random.c b/libgfortran/intrinsics/random.c
index 9ea2889fd25..4e304f6e034 100644
--- a/libgfortran/intrinsics/random.c
+++ b/libgfortran/intrinsics/random.c
@@ -31,7 +31,7 @@ Boston, MA 02110-1301, USA.  */
 
 #include "config.h"
 #include "libgfortran.h"
-#include "../io/io.h"
+#include <gthr.h>
 
 extern void random_r4 (GFC_REAL_4 *);
 iexport_proto(random_r4);
diff --git a/libgfortran/intrinsics/rename.c b/libgfortran/intrinsics/rename.c
index 9e1d53308cb..c1be29bd79b 100644
--- a/libgfortran/intrinsics/rename.c
+++ b/libgfortran/intrinsics/rename.c
@@ -35,8 +35,6 @@ Boston, MA 02110-1301, USA.  */
 #include <stdio.h>
 #include <string.h>
 
-#include "../io/io.h"
-
 /* SUBROUTINE RENAME(PATH1, PATH2, STATUS)
    CHARACTER(len=*), INTENT(IN) :: PATH1, PATH2
    INTEGER, INTENT(OUT), OPTIONAL :: STATUS  */
diff --git a/libgfortran/intrinsics/sleep.c b/libgfortran/intrinsics/sleep.c
index 3a482fa2f1c..a344085c8c6 100644
--- a/libgfortran/intrinsics/sleep.c
+++ b/libgfortran/intrinsics/sleep.c
@@ -33,8 +33,6 @@ Boston, MA 02110-1301, USA.  */
 
 #include <errno.h>
 
-#include "../io/io.h"
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/libgfortran/intrinsics/stat.c b/libgfortran/intrinsics/stat.c
index ab134ab4b18..98511640f56 100644
--- a/libgfortran/intrinsics/stat.c
+++ b/libgfortran/intrinsics/stat.c
@@ -49,8 +49,6 @@ Boston, MA 02110-1301, USA.  */
 
 #include <errno.h>
 
-#include "../io/io.h"
-
 /* SUBROUTINE STAT(FILE, SARRAY, STATUS)
    CHARACTER(len=*), INTENT(IN) :: FILE
    INTEGER, INTENT(OUT), :: SARRAY(13)
diff --git a/libgfortran/intrinsics/symlnk.c b/libgfortran/intrinsics/symlnk.c
index 2e778635986..76835884a17 100644
--- a/libgfortran/intrinsics/symlnk.c
+++ b/libgfortran/intrinsics/symlnk.c
@@ -33,8 +33,6 @@ Boston, MA 02110-1301, USA.  */
 
 #include <errno.h>
 
-#include "../io/io.h"
-
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
diff --git a/libgfortran/intrinsics/time.c b/libgfortran/intrinsics/time.c
index da5a1ffd333..6c91e45b3f5 100644
--- a/libgfortran/intrinsics/time.c
+++ b/libgfortran/intrinsics/time.c
@@ -44,8 +44,6 @@ Boston, MA 02110-1301, USA.  */
 #  endif
 #endif
 
-#include "../io/io.h"
-
 
 /* INTEGER(KIND=4) FUNCTION TIME()  */