diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-09-10 22:03:10 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-09-10 22:03:10 +0000 |
| commit | 5e25b6c0051d1080d65f763ab41fdd3ccf4c0266 (patch) | |
| tree | 2d703bb5c0f735c114d35388f4ce82a2a194fe18 /libjava/include/jvm.h | |
| parent | 58aea4f55da2dbf234dd4a1a9229f2df2ef25134 (diff) | |
| download | gcc-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/include/jvm.h')
| -rw-r--r-- | libjava/include/jvm.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index 94cd3d2def5..7b0b476a2ed 100644 --- a/libjava/include/jvm.h +++ b/libjava/include/jvm.h @@ -11,8 +11,18 @@ details. */ #ifndef __JAVA_JVM_H__ #define __JAVA_JVM_H__ +#include <gcj/javaprims.h> + #include <java-assert.h> -#include <java-field.h> +#include <java-threads.h> +// Must include java-gc.h before Object.h for the implementation. +#include <java-gc.h> + +#include <java/lang/Object.h> + +// Include cni.h before field.h to enable all definitions. FIXME. +#include <gcj/cni.h> +#include <gcj/field.h> /* Structure of the virtual table. */ struct _Jv_VTable |