Makefile.in (gjavah.o): Depend on $(JAVA_TREE_H).

        * Makefile.in (gjavah.o): Depend on $(JAVA_TREE_H).
        * gjavah.c: Include math.h earlier.  Include tree.h/java-tree.h.
        (main_jcf): Don't define.
        (process_file): Don't set `main_jcf'.
        * java-tree.h (main_jcf): Don't declare.
        * jcf-parse.c (main_jcf): Add static definition.
        * lang.c (main_jcf): Don't define.

From-SVN: r26204

6 files changed, 24 insertions, 6 deletions

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 22eb0a6..38432af 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,17 @@
+Mon Apr  5 16:06:09 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* Makefile.in (gjavah.o): Depend on $(JAVA_TREE_H).
+
+	* gjavah.c: Include math.h earlier.  Include tree.h/java-tree.h.
+	(main_jcf): Don't define.
+	(process_file): Don't set `main_jcf'.
+	
+	* java-tree.h (main_jcf): Don't declare.
+
+	* jcf-parse.c (main_jcf): Add static definition.
+
+	* lang.c (main_jcf): Don't define.
+
 Mon Apr  5 15:43:51 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
         * class.c (add_method_1): Cast the argument of `bzero' to PTR.
diff --git a/gcc/java/Makefile.in b/gcc/java/Makefile.in
index 0b79c24..2dc453c 100644
--- a/gcc/java/Makefile.in
+++ b/gcc/java/Makefile.in
@@ -276,7 +276,7 @@ force:
 parse.o : $(PARSE_C) jcf-reader.c $(CONFIG_H) $(srcdir)/../system.h
 jcf-dump.o : $(CONFIG_H) $(srcdir)/../system.h $(JAVA_TREE_H) jcf-dump.c \
   jcf-reader.c jcf.h javaop.h javaop.def
-gjavah.o : $(CONFIG_H) $(srcdir)/../system.h gjavah.c \
+gjavah.o : $(CONFIG_H) $(srcdir)/../system.h $(JAVA_TREE_H) gjavah.c \
   jcf-reader.c jcf.h javaop.h
 buffer.o : buffer.c $(CONFIG_H) buffer.h $(srcdir)/../gansidecl.h \
   $(srcdir)/../system.h $(srcdir)/../toplev.h
diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index 8fbcc2c..faf2c9e 100644
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -26,9 +26,12 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 
 #include "config.h"
 #include "system.h"
+#include <math.h>
+
 #include "jcf.h"
+#include "tree.h"
+#include "java-tree.h"
 #include "java-opcodes.h"
-#include <math.h>
 
 /* The output file.  */
 FILE *out = NULL;
@@ -72,7 +75,6 @@ int verbose = 0;
 int stubs = 0;
 
 struct JCF *current_jcf;
-struct JCF *main_jcf;
 
 /* This holds access information for the last field we examined.  They
    let us generate "private:", "public:", and "protected:" properly.
@@ -1169,7 +1171,7 @@ DEFUN(process_file, (jcf, out),
   int code, i;
   uint32 field_start, method_end, method_start;
 
-  current_jcf = main_jcf = jcf;
+  current_jcf = jcf;
 
   last_access = -1;
 
diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h
index 2925c04..9a1e964 100644
--- a/gcc/java/java-tree.h
+++ b/gcc/java/java-tree.h
@@ -139,7 +139,7 @@ extern int flag_not_overriding;
 extern int flag_static_local_jdk1_1;
 
 /* The Java .class file that provides main_class;  the main input file. */
-extern struct JCF main_jcf[1], *current_jcf;
+extern struct JCF *current_jcf;
 
 typedef struct CPool constant_pool;
 
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 1b9db4e..7b58229 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -77,6 +77,9 @@ static tree current_field = NULL_TREE;
 /* The METHOD_DECL for the current method.  */
 static tree current_method = NULL_TREE;
 
+/* The Java .class file that provides main_class;  the main input file. */
+static struct JCF main_jcf[1];
+
 /* Declarations of some functions used here.  */
 static tree give_name_to_class PROTO ((JCF *jcf, int index));
 static void parse_zip_file_entries PROTO ((void));
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index 9fc7c1e..009b612 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -125,7 +125,6 @@ lang_f_options[] =
   {"emit-class-files", &flag_emit_class_files, 1},
 };
 
-JCF main_jcf[1];
 JCF *current_jcf;
 
 /* Variable controlling how dependency tracking is enabled in