* Make-lang.in: Fix reference to srcdir.

	* jv-scan.c: Add missing xmalloc prototype.
	* jvgenmain.c: Ditto.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@23662 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index a9da798..7e2db9f 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+Sun Nov 15 15:09:56 1998  Anthony Green  <green@hoser.cygnus.com>
+
+       * Make-lang.in: Fix reference to srcdir.
+       * jv-scan.c: Add missing xmalloc prototype.
+       * jvgenmain.c: Ditto.
+
 Sun Nov 15 14:36:29 1998  Per Bothner  <bothner@cygnus.com>
 
        * decl.c (error_mark_node), java-tree.h:  New global.
@@ -22,6 +28,7 @@ Sun Nov 15 14:36:29 1998  Per Bothner  <bothner@cygnus.com>
        (- case PREDECREMENT_EXPR etc):  Remove redundant NOTE_PUSH.
        (generate_classfile):  More robust for abstract methods.
 
+>>>>>>> 1.51
 Sun Nov 15 13:52:39 1998  Anthony Green  <green@cygnus.com>
 
        * Makefile.in: jv-scan and jvgenmain all require libiberty.

diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 0e70024..a2c2737 100644 (file)
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -127,7 +127,7 @@ gcjh$(exeext): $(GCJH_SOURCES) $(LIBDEPS)
 
 # This must be kept in sync with dependencies in Makefile.in.
 JV_SCAN_SOURCES = $(srcdir)/java/parse-scan.y $(srcdir)/java/lex.c \
-       $(srcdir)/java/parse.h $(srcdir)/java/lex.h $(srcdir)/java/jv-scan.c $(src)/../libiberty/xmalloc.c $(src)/../libiberty/xstrdup.c
+       $(srcdir)/java/parse.h $(srcdir)/java/lex.h $(srcdir)/java/jv-scan.c $(srcdir)/../libiberty/xmalloc.c $(srcdir)/../libiberty/xstrdup.c
 
 jv-scan$(exeext): $(JV_SCAN_SOURCES) stamp-objlist $(LIBDEPS)
        cd java && $(MAKE) $(FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../jv-scan$(exeext)

diff --git a/gcc/java/jv-scan.c b/gcc/java/jv-scan.c
index 3afd226..1f3dbae 100644 (file)
--- a/gcc/java/jv-scan.c
+++ b/gcc/java/jv-scan.c
@@ -34,6 +34,7 @@ void fatal VPROTO((char *s, ...));
 void warning VPROTO((char *s, ...));
 void gcc_obstack_init PROTO ((struct obstack *obstack));
 extern void reset_report PROTO ((void));
+extern char *xmalloc PROTO((size_t));
 
 #define JC1_LITE
 #include "parse.h"

diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c
index f0c987e..43b8d7b 100644 (file)
--- a/gcc/java/jvgenmain.c
+++ b/gcc/java/jvgenmain.c
@@ -34,6 +34,8 @@ const char class_mangling_prefix[] = "_CL_";
 
 struct obstack name_obstack;
 
+extern char *xmalloc PROTO((size_t));
+
 void
 error (const char *str)
 {