configure: Rebuilt.
* 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. From-SVN: r29278
This commit is contained in:
parent
512d594b4f
commit
27e934d8ba
65 changed files with 739 additions and 155 deletions
|
@ -6,8 +6,8 @@ This software is copyrighted work licensed under the terms of the
|
|||
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
||||
details. */
|
||||
|
||||
#ifndef __JAVA_JNI_H__
|
||||
#define __JAVA_JNI_H__
|
||||
#ifndef __GCJ_JNI_H__
|
||||
#define __GCJ_JNI_H__
|
||||
|
||||
#include <stdarg.h>
|
||||
#define _Jv_va_list va_list
|
||||
|
@ -15,7 +15,7 @@ details. */
|
|||
#ifdef __cplusplus
|
||||
|
||||
// This is wrong, because it pollutes the name-space too much!
|
||||
#include <javaprims.h>
|
||||
#include <gcj/javaprims.h>
|
||||
|
||||
typedef struct _Jv_JNIEnv JNIEnv;
|
||||
#else
|
||||
|
@ -293,4 +293,4 @@ _Jv_JNIEnv::GetStringLength (jstring str)
|
|||
|
||||
#endif
|
||||
|
||||
#endif /* __JAVA_JNI_H__ */
|
||||
#endif /* __GCJ_JNI_H__ */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue