decl.c: Include defaults.h instead of expr.h.

        * decl.c: Include defaults.h instead of expr.h.
        * parse.y: Likewise.

From-SVN: r28431

gcc/java/ChangeLog

+1999-08-02  Richard Henderson  <rth@cygnus.com>
+
+	* decl.c: Include defaults.h instead of expr.h.
+	* parse.y: Likewise.
+
 1999-08-02  Jakub Jelinek  <jj@ultra.linux.cz>
 
 	* java/decl.c (start_java_method): Change all uses of

gcc/java/decl.c

@@ -34,7 +34,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "toplev.h"
 #include "function.h"
 #include "except.h"
-#include "expr.h"
+#include "defaults.h"
 
 static tree push_jvm_slot PROTO ((int, tree));
 static tree builtin_function PROTO ((const char *, tree,

gcc/java/expr.c

@@ -39,6 +39,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "parse.h"
 #include "toplev.h"
 #include "except.h"
+#include "defaults.h"
 
 static void flush_quick_stack PROTO ((void));
 static void push_value PROTO ((tree));

gcc/java/parse.y

@@ -64,7 +64,7 @@ definitions and other extensions.  */
 #include "xref.h"
 #include "function.h"
 #include "except.h"
-#include "expr.h"
+#include "defaults.h"
 
 #ifndef DIR_SEPARATOR
 #define DIR_SEPARATOR '/'
@@ -5593,12 +5593,10 @@ expand_start_java_method (fndecl)
     {
       tree next = TREE_CHAIN (tem);
       tree type = TREE_TYPE (tem);
-#ifdef PROMOTE_PROTOTYPES
       if (PROMOTE_PROTOTYPES
 	  && TYPE_PRECISION (type) < TYPE_PRECISION (integer_type_node)
 	  && INTEGRAL_TYPE_P (type))
 	type = integer_type_node;
-#endif
       DECL_ARG_TYPE (tem) = type;
       layout_decl (tem, 0);
       pushdecl (tem);