summaryrefslogtreecommitdiff
path: root/libjava/gnu
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>1999-09-10 22:03:10 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>1999-09-10 22:03:10 +0000
commit5e25b6c0051d1080d65f763ab41fdd3ccf4c0266 (patch)
tree2d703bb5c0f735c114d35388f4ce82a2a194fe18 /libjava/gnu
parent58aea4f55da2dbf234dd4a1a9229f2df2ef25134 (diff)
downloadgcc-5e25b6c0051d1080d65f763ab41fdd3ccf4c0266.tar.gz
* configure: Rebuilt.
* configure.in: Build include/Makefile. * Makefile.in: Rebuilt. * Makefile.am (SUBDIRS): Added gcj and include. (install-data-local): New target. (extra_headers): New macro. * include/Makefile.in: New file. * include/Makefile.am: New file. * interpret.cc: Don't include gcj/field.h or gcj/cni.h. * java/lang/reflect/natField.cc: Don't include gcj/field.h or gcj/cni.h. * boehm.cc: Don't include java-threads.h or gcj/field.h. * resolve.cc: Include config.h. * defineclass.cc: Include config.h. * include/java-interp.h: Don't include config.h. * include/jvm.h: Include java-threads.h, Object.h, java-gc.h, cni.h. * gcj/javaprims.h: Regenerated namespace decls. * classes.pl (scan): Don't put `;' after closing brace. * Makefile.in: Rebuilt. * Makefile.am (INCLUDES): Added -I for top_srcdir. * configure.in: Create gcj/Makefile. * gcj/Makefile.in: New file. * gcj/Makefile.am: New file. * java/lang/Object.h: Don't include any other headers. * gcj/array.h: Renamed from include/java-array.h. * gcj/field.h: Renamed from include/java-field.h. * gcj/method.h: Renamed from include/java-method.h. * gcj/cni.h, gcj/javaprims.h: Moved from include/. Updated all files to reflect new include structure. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@29278 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu')
-rw-r--r--libjava/gnu/gcj/convert/natInput_EUCJIS.cc2
-rw-r--r--libjava/gnu/gcj/convert/natInput_SJIS.cc2
-rw-r--r--libjava/gnu/gcj/convert/natOutput_EUCJIS.cc2
-rw-r--r--libjava/gnu/gcj/convert/natOutput_SJIS.cc2
4 files changed, 4 insertions, 4 deletions
diff --git a/libjava/gnu/gcj/convert/natInput_EUCJIS.cc b/libjava/gnu/gcj/convert/natInput_EUCJIS.cc
index 8f3b272b7bd..fb99d5a2e13 100644
--- a/libjava/gnu/gcj/convert/natInput_EUCJIS.cc
+++ b/libjava/gnu/gcj/convert/natInput_EUCJIS.cc
@@ -7,7 +7,7 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
#include <config.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <gnu/gcj/convert/Input_EUCJIS.h>
#define ERROR_CHAR 0xFFFD
diff --git a/libjava/gnu/gcj/convert/natInput_SJIS.cc b/libjava/gnu/gcj/convert/natInput_SJIS.cc
index 5a040b17972..d02b57c229a 100644
--- a/libjava/gnu/gcj/convert/natInput_SJIS.cc
+++ b/libjava/gnu/gcj/convert/natInput_SJIS.cc
@@ -7,7 +7,7 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
#include <config.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <gnu/gcj/convert/Input_SJIS.h>
#define ERROR_CHAR 0xFFFD
diff --git a/libjava/gnu/gcj/convert/natOutput_EUCJIS.cc b/libjava/gnu/gcj/convert/natOutput_EUCJIS.cc
index 585e56b25c5..fe8fd982442 100644
--- a/libjava/gnu/gcj/convert/natOutput_EUCJIS.cc
+++ b/libjava/gnu/gcj/convert/natOutput_EUCJIS.cc
@@ -7,7 +7,7 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
#include <config.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <gnu/gcj/convert/Output_EUCJIS.h>
/* A trie structure to map unicode values to JIS codes.
diff --git a/libjava/gnu/gcj/convert/natOutput_SJIS.cc b/libjava/gnu/gcj/convert/natOutput_SJIS.cc
index 66be27b4635..d028f11fe10 100644
--- a/libjava/gnu/gcj/convert/natOutput_SJIS.cc
+++ b/libjava/gnu/gcj/convert/natOutput_SJIS.cc
@@ -7,7 +7,7 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
#include <config.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <gnu/gcj/convert/Output_SJIS.h>
extern unsigned short Unicode_to_JIS[];