aboutsummaryrefslogtreecommitdiff
path: root/libjava/include/jni.h
diff options
context:
space:
mode:
authorTom Tromey <tromey@cygnus.com>1999-09-10 22:03:10 +0000
committerTom Tromey <tromey@gcc.gnu.org>1999-09-10 22:03:10 +0000
commit27e934d8bae03ea7eddeb3770641440333a71478 (patch)
tree2d703bb5c0f735c114d35388f4ce82a2a194fe18 /libjava/include/jni.h
parent512d594b4f7945440be373bf14c6af8b88c91749 (diff)
downloadgcc-27e934d8bae03ea7eddeb3770641440333a71478.zip
gcc-27e934d8bae03ea7eddeb3770641440333a71478.tar.gz
gcc-27e934d8bae03ea7eddeb3770641440333a71478.tar.bz2
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
Diffstat (limited to 'libjava/include/jni.h')
-rw-r--r--libjava/include/jni.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/libjava/include/jni.h b/libjava/include/jni.h
index d589b02..e3ae6b3 100644
--- a/libjava/include/jni.h
+++ b/libjava/include/jni.h
@@ -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__ */