gfortran.h: Do not include coretypes.h here.

	* gfortran.h: Do not include coretypes.h here.
	Make it an error to include this before coretypes.h
	* openmp.c: Include coretypes.h.
	* interface.c: Likewise.
	* intrinsic.c: Likewise.
	* symbol.c: Likewise.
	* class.c: Likewise.
	* decl.c: Likewise.
	* matchexp.c: Likewise.
	* dump-parse-tree.c: Likewise.
	* array.c: Likewise.
	* constructor.c: Likewise.
	* error.c: Likewise.
	* data.c: Likewise.
	* expr.c: Likewise.
	* module.c: Likewise.
	* scanner.c: Likewise.
	* bbt.c: Likewise.
	* io.c: Likewise.
	* frontend-passes.c: Likewise.
	* resolve.c: Likewise.
	* st.c: Likewise.
	* target-memory.c: Likewise.
	* match.c: Likewise.
	* arith.c: Likewise.
	* parse.c: Likewise.
	* check.c: Likewise.
	* dependency.c: Likewise.
	* primary.c: Likewise.
	* misc.c: Likewise.
	* simplify.c: Likewise.

From-SVN: r189357

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 3d85f29fd8226a122992ee05a150ee6622f5c10a..8a2a767cb3b29f8aab427928cb6342854e8b423e 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,37 @@
+2012-07-08  Steven Bosscher  <steven@gcc.gnu.org>
+
+       * gfortran.h: Do not include coretypes.h here.
+       Make it an error to include this before coretypes.h
+       * openmp.c: Include coretypes.h.
+       * interface.c: Likewise.
+       * intrinsic.c: Likewise.
+       * symbol.c: Likewise.
+       * class.c: Likewise.
+       * decl.c: Likewise.
+       * matchexp.c: Likewise.
+       * dump-parse-tree.c: Likewise.
+       * array.c: Likewise.
+       * constructor.c: Likewise.
+       * error.c: Likewise.
+       * data.c: Likewise.
+       * expr.c: Likewise.
+       * module.c: Likewise.
+       * scanner.c: Likewise.
+       * bbt.c: Likewise.
+       * io.c: Likewise.
+       * frontend-passes.c: Likewise.
+       * resolve.c: Likewise.
+       * st.c: Likewise.
+       * target-memory.c: Likewise.
+       * match.c: Likewise.
+       * arith.c: Likewise.
+       * parse.c: Likewise.
+       * check.c: Likewise.
+       * dependency.c: Likewise.
+       * primary.c: Likewise.
+       * misc.c: Likewise.
+       * simplify.c: Likewise.
+
 2012-07-05  Mikael Morin  <mikael@gcc.gnu.org>
 
        PR fortran/53732

diff --git a/gcc/fortran/arith.c b/gcc/fortran/arith.c
index 53a9dad42fec0d16b16536eaa7381a3cdc4a7d75..38ba2711d121c950bce2a187447a5090184b55c6 100644 (file)
--- a/gcc/fortran/arith.c
+++ b/gcc/fortran/arith.c
@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "flags.h"
 #include "gfortran.h"
 #include "arith.h"

diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index b36d517cff7b1927d7ba48d0da2468848d602b03..51528b410f6a91f2ed1bcc89b0006a9ef4f6d88f 100644 (file)
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "gfortran.h"
 #include "match.h"
 #include "constructor.h"

diff --git a/gcc/fortran/bbt.c b/gcc/fortran/bbt.c
index a78467be8b702652ea44aa27855dfbca3b2901d0..000f04bcbf86ed7bf72810837410e7e99ede8f0f 100644 (file)
--- a/gcc/fortran/bbt.c
+++ b/gcc/fortran/bbt.c
@@ -38,6 +38,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "gfortran.h"
 
 typedef struct gfc_treap

diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index 7d505d5e9d9d478b12983efc91ea65cbbaa59a3a..407052f655de6f904fd7da759e7548f34bcb81c4 100644 (file)
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -29,6 +29,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "flags.h"
 #include "gfortran.h"
 #include "intrinsic.h"

diff --git a/gcc/fortran/class.c b/gcc/fortran/class.c
index c71aa4a7c48231aeb9cd8cfe5be6d4ff40f7e90a..fc083dcb0924766dd9adfa4377a46dc9b9627f02 100644 (file)
--- a/gcc/fortran/class.c
+++ b/gcc/fortran/class.c
@@ -48,6 +48,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "gfortran.h"
 #include "constructor.h"
 

diff --git a/gcc/fortran/constructor.c b/gcc/fortran/constructor.c
index 600488d640fe6d43891b1f9ba6daedbbc2e36bca..182d00d165d6634fcbe244a56f82e5d687eb7956 100644 (file)
--- a/gcc/fortran/constructor.c
+++ b/gcc/fortran/constructor.c
@@ -20,6 +20,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "gfortran.h"
 #include "constructor.h"
 

diff --git a/gcc/fortran/data.c b/gcc/fortran/data.c
index 67da371ad543ebbb2885f72e67095108374364f2..a55b67e074fceedf51040bdc9d582a2812312e49 100644 (file)
--- a/gcc/fortran/data.c
+++ b/gcc/fortran/data.c
@@ -35,6 +35,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "gfortran.h"
 #include "data.h"
 #include "constructor.h"

diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 26b5059cd9f17cace9fe39543986df0de38031ef..c3644b6d8f8dffb7341e62ed2d367411c8210fff 100644 (file)
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "gfortran.h"
 #include "match.h"
 #include "parse.h"

diff --git a/gcc/fortran/dependency.c b/gcc/fortran/dependency.c
index a2cf21d65f18a274cdc301a4ee6b65da8b355bb6..108815a44d9400b08b3802b6ad1f5a882f967232 100644 (file)
--- a/gcc/fortran/dependency.c
+++ b/gcc/fortran/dependency.c
@@ -26,6 +26,7 @@ along with GCC; see the file COPYING3.  If not see
    
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "gfortran.h"
 #include "dependency.h"
 #include "constructor.h"

diff --git a/gcc/fortran/dump-parse-tree.c b/gcc/fortran/dump-parse-tree.c
index 7f1d28fd7c973e116c539da47bb8b5806926206c..26c5201f065434318f483f6946498047d52598fc 100644 (file)
--- a/gcc/fortran/dump-parse-tree.c
+++ b/gcc/fortran/dump-parse-tree.c
@@ -33,6 +33,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "gfortran.h"
 #include "constructor.h"
 

diff --git a/gcc/fortran/error.c b/gcc/fortran/error.c
index e9308374ac65afb651938a38d9f85451f2fddf3f..25d3cba9750739545a980024e7dd543c7b27ce0d 100644 (file)
--- a/gcc/fortran/error.c
+++ b/gcc/fortran/error.c
@@ -28,6 +28,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "flags.h"
 #include "gfortran.h"
 

diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index 0b38cacad9447ad4bd63a3f293acb8af2cbfa181..a107369f23efdec177adc6d56c42a3fca263d1f3 100644 (file)
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "gfortran.h"
 #include "arith.h"
 #include "match.h"

diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c
index fc32e56dfc62c2672e73790da1cb44ba822464bd..437ed7ec1757d0da422fc5665ee394a0cf1a2b20 100644 (file)
--- a/gcc/fortran/frontend-passes.c
+++ b/gcc/fortran/frontend-passes.c
@@ -20,6 +20,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "gfortran.h"
 #include "arith.h"
 #include "flags.h"

diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index caa23bd6388d68b80caf0909fdd3dbd648216d6c..6d75e632088c58914991a3b8c66e82746e7905e5 100644 (file)
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -29,13 +29,16 @@ along with GCC; see the file COPYING3.  If not see
    multiple header files.  Besides, Microsoft's winnt.h was 250k last
    time I looked, so by comparison this is perfectly reasonable.  */
 
+#ifndef GCC_CORETYPES_H
+#error "gfortran.h must be included after coretypes.h"
+#endif
+
 /* Declarations common to the front-end and library are put in
    libgfortran/libgfortran_frontend.h  */
 #include "libgfortran.h"
 
 
 #include "intl.h"
-#include "coretypes.h"
 #include "input.h"
 #include "splay-tree.h"
 

diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index 34e1ad7f88bc6c4b17547c6566752fc8e9fac6be..6f40ba76e686cb42c0ac615e339b11bc17a3f322 100644 (file)
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -67,6 +67,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "gfortran.h"
 #include "match.h"
 #include "arith.h"

diff --git a/gcc/fortran/intrinsic.c b/gcc/fortran/intrinsic.c
index 88d4636bd7144de97c27569feecf322791f684f7..a7ab56ee74f73da1a2696487bc00968ff8750188 100644 (file)
--- a/gcc/fortran/intrinsic.c
+++ b/gcc/fortran/intrinsic.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "flags.h"
 #include "gfortran.h"
 #include "intrinsic.h"

diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c
index 7caadc5056cd34cd5c126295353d5f0fb17ef1dc..3bc427d61599c3205f18f2c06169d32efcfabdd0 100644 (file)
--- a/gcc/fortran/io.c
+++ b/gcc/fortran/io.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "flags.h"
 #include "gfortran.h"
 #include "match.h"

diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index 3d63510b00bc604085b055f6eb6fd06aeb5eb775..f86916a9c22242230418542601db65b7643d3b2f 100644 (file)
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "flags.h"
 #include "gfortran.h"
 #include "match.h"

diff --git a/gcc/fortran/matchexp.c b/gcc/fortran/matchexp.c
index cd70dc0f7584978bb9eae350fe0e6351ad037d67..12d5b2dcbaba46c3c0902d6d14a352bf9e40d885 100644 (file)
--- a/gcc/fortran/matchexp.c
+++ b/gcc/fortran/matchexp.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "gfortran.h"
 #include "arith.h"
 #include "match.h"

diff --git a/gcc/fortran/misc.c b/gcc/fortran/misc.c
index 012364ae774c09aa100b1f6ecff50e52e2c17b03..60c3cf1ddd3d8d49cbf732aec48c444eb904c0be 100644 (file)
--- a/gcc/fortran/misc.c
+++ b/gcc/fortran/misc.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "gfortran.h"
 
 

diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c
index 60a74cacca43277f1d308d7cab6bde9371bff03d..6fe23a2857814dfc3f028a7b5aed784d3c352e1b 100644 (file)
--- a/gcc/fortran/module.c
+++ b/gcc/fortran/module.c
@@ -68,6 +68,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "gfortran.h"
 #include "arith.h"
 #include "match.h"

diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index f5a58779c0cc463058748c1d6d43d1f5ebd49ccc..e1ffa6b49f78c5197d4f19e9835406d9ff5b429a 100644 (file)
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "flags.h"
 #include "gfortran.h"
 #include "match.h"

diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index 54c6fc1010e5c06b89435462cad02b0af8ba4882..ad4e89e9a90086b1f0dbc7ebefd4668f52138e3f 100644 (file)
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include <setjmp.h>
+#include "coretypes.h"
 #include "gfortran.h"
 #include "match.h"
 #include "parse.h"

diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c
index 41e2fa81efbeda836310369eaa0fc4f396ec4c06..2e71024db4fe2c96e02333263ba90771c7921f81 100644 (file)
--- a/gcc/fortran/primary.c
+++ b/gcc/fortran/primary.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "flags.h"
 #include "gfortran.h"
 #include "arith.h"

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 0434e0804c7445eb4ba5d52851a7d58b8174fc3a..5be1857ef79daaba49f538e848909fbc01390e98 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "flags.h"
 #include "gfortran.h"
 #include "obstack.h"

diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c
index 120d55022b82ad4f66e243b05aaaac5914aefcdc..4fad58b9148278b4edf42a3976a7fca7b1ddddaa 100644 (file)
--- a/gcc/fortran/scanner.c
+++ b/gcc/fortran/scanner.c
@@ -43,6 +43,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "gfortran.h"
 #include "toplev.h"    /* For set_src_pwd.  */
 #include "debug.h"

diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index 1578db19b94866079bc2edc9aad26f23e00330b4..c7145d6eb968fc87fac48375e480ec049b18001c 100644 (file)
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "flags.h"
 #include "gfortran.h"
 #include "arith.h"

diff --git a/gcc/fortran/st.c b/gcc/fortran/st.c
index 932c9428af8617152e8a232a2ec0c59dc5c1b54a..ed379fc44af6d82aa3da7aeb657dfa086ebbd298 100644 (file)
--- a/gcc/fortran/st.c
+++ b/gcc/fortran/st.c
@@ -26,6 +26,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "gfortran.h"
 
 gfc_code new_st;

diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index 6ca4ca330142a800b7324da062d661f8a441ca8c..378f83c23ddc23202b27d09ccc4c60d50cd8b4f8 100644 (file)
--- a/gcc/fortran/symbol.c
+++ b/gcc/fortran/symbol.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "flags.h"
 #include "gfortran.h"
 #include "parse.h"

diff --git a/gcc/fortran/target-memory.c b/gcc/fortran/target-memory.c
index 63878959b47e39fd4b1e2117eb59d556ce6ec96f..637811e0965750fe3a5dc80eb1771024c9473286 100644 (file)
--- a/gcc/fortran/target-memory.c
+++ b/gcc/fortran/target-memory.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "flags.h"
 #include "machmode.h"
 #include "tree.h"