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

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"

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.  */

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

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: