expr.h (PROMOTE_PROTOTYPES): Move ...

        * expr.h (PROMOTE_PROTOTYPES): Move ...
        * defaults.h: ... to here.
        * c-decl.c: Include defaults.h instead of expr.h.
        * c-typeck.c: Include defaults.h.

From-SVN: r28433

diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 2c1dacdbccca63f80a359637279662dca993545f..1060f40cd4a7d5c3e64a63b0d1607166c6876e24 100644 (file)
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -34,7 +34,7 @@ Boston, MA 02111-1307, USA.  */
 #include "c-tree.h"
 #include "c-lex.h"
 #include "toplev.h"
-#include "expr.h"
+#include "defaults.h"
 
 #if USE_CPPLIB
 #include "cpplib.h"

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 1d9e9e37caf563aca0032aeb0e61f78115cbd9e5..73d98e96419ba82a30879f49659d1495865132d0 100644 (file)
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -38,6 +38,7 @@ Boston, MA 02111-1307, USA.  */
 #include "expr.h"
 #include "toplev.h"
 #include "intl.h"
+#include "defaults.h"
 
 /* Nonzero if we've already printed a "missing braces around initializer"
    message within this initializer.  */

diff --git a/gcc/defaults.h b/gcc/defaults.h
index 14c365a2b44002ecae7578878cb0c9b7e1d8a2eb..90d483f308efd4787c0f5c9275ee5ed3228973a2 100644 (file)
--- a/gcc/defaults.h
+++ b/gcc/defaults.h
@@ -164,3 +164,8 @@ do { fprintf (FILE, "\t%s\t", ASM_LONG);                            \
 #ifndef DWARF2_GENERATE_TEXT_SECTION_LABEL
 #define DWARF2_GENERATE_TEXT_SECTION_LABEL 1
 #endif
+
+/* Supply a default definition for PROMOTE_PROTOTYPES.  */
+#ifndef PROMOTE_PROTOTYPES
+#define PROMOTE_PROTOTYPES     0
+#endif

diff --git a/gcc/expr.h b/gcc/expr.h
index 6bc7bb9939b3baa11354707107dceb971073370c..7f1396d7d7021c729d10cca79730f1c0a366d39a 100644 (file)
--- a/gcc/expr.h
+++ b/gcc/expr.h
@@ -251,11 +251,6 @@ enum direction {none, upward, downward};  /* Value has this type.  */
 #define PRETEND_OUTGOING_VARARGS_NAMED 0
 #endif
 
-/* Supply a default definition for PROMOTE_PROTOTYPES.  */
-#ifndef PROMOTE_PROTOTYPES
-#define PROMOTE_PROTOTYPES     0
-#endif
-
 /* Nonzero if we do not know how to pass TYPE solely in registers.
    We cannot do so in the following cases: