* src/native/jni.h: Removed.

* src/native/jni.hpp: New file.
* Fixed include path in all files using this header.

--HG--
rename : src/native/jni.h => src/native/jni.hpp

diff --git a/src/cacao/cacao.cpp b/src/cacao/cacao.cpp
index e1ad4163029fe24410628285018e08b20d39e622..08a0ff8952018dcd32a1b3febf045590e18b7800 100644 (file)
--- a/src/cacao/cacao.cpp
+++ b/src/cacao/cacao.cpp
@@ -38,7 +38,7 @@
 
 #include "vm/types.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JVMTI)

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index facd048b9b37b4dcc6fc18a5fb690a929b8b8b59..f18f9c2d4732fc3356d389633943f2fa559ea6b4 100644 (file)
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -38,7 +38,7 @@ noinst_LTLIBRARIES = libnative.la
 if ENABLE_JNI
 JNI_SOURCES = \
        jni.cpp \
-       jni.h \
+       jni.hpp \
        localref.c \
        localref.h
 endif

diff --git a/src/native/jni.cpp b/src/native/jni.cpp
index 842840bdcc4122375a74fb77e2def6126a52b490..e0f5445d21b0e5dccdbc76ef24365e8ec0662485 100644 (file)
--- a/src/native/jni.cpp
+++ b/src/native/jni.cpp
@@ -34,7 +34,7 @@
 #include "mm/gc.hpp"
 #include "mm/memory.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/localref.h"
 #include "native/native.h"

diff --git a/src/native/jni.h b/src/native/jni.h
deleted file mode 100644 (file)
index aacd850..0000000
--- a/src/native/jni.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* src/native/jni.h - JNI types and data structures
-
-   Copyright (C) 1996-2005, 2006, 2007, 2008
-   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
-
-   This file is part of CACAO.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-*/
-
-
-/* jni.h ***********************************************************************
-
-   ATTENTION: We include this file before we actually define our own
-   jni.h.  We do this because otherwise we can get into unresolvable
-   circular header dependencies.
-
-   This is OK as GNU Classpath defines:
-
-   #define __CLASSPATH_JNI_MD_H__
-   #define _CLASSPATH_JNI_H
-
-   and OpenJDK defines:
-
-   #define _JAVASOFT_JNI_MD_H_
-   #define _JAVASOFT_JNI_H_
-
-   CLASSPATH_JNI_MD_H and CLASSPATH_JNI_H are defined in config.h.
-
-*******************************************************************************/
-
-#include "config.h"
-
-/* We include both headers with the absolute path so we can be sure
-   that the preprocessor does not take another header.  Furthermore we
-   include jni_md.h before jni.h as the latter includes the former. */
-
-#include INCLUDE_JNI_MD_H
-#include INCLUDE_JNI_H
-
-#ifndef _JNI_H
-#define _JNI_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "vm/types.h"
-
-#include "vm/global.h"
-#include "vm/method.h"
-
-
-#if 0
-/* _Jv_JNIEnv *****************************************************************/
-
-#ifndef __cplusplus
-
-// FIXME The __cplusplus define is just a quick workaround and needs
-// to be fixed properly.
-
-typedef struct _Jv_JNIEnv _Jv_JNIEnv;
-
-struct _Jv_JNIEnv {
-       const struct JNINativeInterface_ *env;    /* This MUST be the first entry */
-};
-
-#endif
-
-
-/* _Jv_JavaVM *****************************************************************/
-
-#ifndef __cplusplus
-
-// FIXME The __cplusplus define is just a quick workaround and needs
-// to be fixed properly.
-
-typedef struct _Jv_JavaVM _Jv_JavaVM;
-
-struct _Jv_JavaVM {
-       const struct JNIInvokeInterface_ *functions;/*This MUST be the first entry*/
-
-       /* JVM instance-specific variables */
-
-       s8 starttime;                       /* VM startup time                    */
-
-       s4 Java_gnu_java_lang_management_VMClassLoadingMXBeanImpl_verbose;
-       s4 Java_gnu_java_lang_management_VMMemoryMXBeanImpl_verbose;
-       s4 java_lang_management_ThreadMXBean_PeakThreadCount;
-       s4 java_lang_management_ThreadMXBean_ThreadCount;
-       s8 java_lang_management_ThreadMXBean_TotalStartedThreadCount;
-};
-
-#endif
-#endif
-
-
-/* CACAO related stuff ********************************************************/
-
-extern const struct JNIInvokeInterface_ _Jv_JNIInvokeInterface;
-extern struct JNINativeInterface_ _Jv_JNINativeInterface;
-
-
-/* hashtable_global_ref_entry *************************************************/
-
-typedef struct hashtable_global_ref_entry hashtable_global_ref_entry;
-
-struct hashtable_global_ref_entry {
-       java_object_t              *o;      /* object pointer of global ref       */
-       s4                          refs;   /* references of the current pointer  */
-       hashtable_global_ref_entry *hashlink; /* link for external chaining       */
-};
-
-
-/* function prototypes ********************************************************/
-
-bool jni_init(void);
-bool jni_version_check(int version);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _JNI_H */
-
-
-/*
- * These are local overrides for various environment variables in Emacs.
- * Please do not remove this and leave it at the end of the file, where
- * Emacs will automagically detect them.
- * ---------------------------------------------------------------------
- * Local variables:
- * mode: c
- * indent-tabs-mode: t
- * c-basic-offset: 4
- * tab-width: 4
- * End:
- */

diff --git a/src/native/jni.hpp b/src/native/jni.hpp
new file mode 100644 (file)
index 0000000..90dc82c
--- /dev/null
+++ b/src/native/jni.hpp
@@ -0,0 +1,116 @@
+/* src/native/jni.hpp - JNI types and data structures
+
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
+
+   This file is part of CACAO.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+*/
+
+
+/* jni.h ***********************************************************************
+
+   ATTENTION: We include this file before we actually define our own
+   jni.h.  We do this because otherwise we can get into unresolvable
+   circular header dependencies.
+
+   GNU Classpath's headers define:
+
+   #define __CLASSPATH_JNI_MD_H__
+   #define _CLASSPATH_JNI_H
+
+   and jni.h uses:
+
+   _CLASSPATH_VM_JNI_TYPES_DEFINED
+   
+   OpenJDK's headers define:
+
+   #define _JAVASOFT_JNI_MD_H_
+   #define _JAVASOFT_JNI_H_
+
+   and jni.h uses:
+
+   JNI_TYPES_ALREADY_DEFINED_IN_JNI_MD_H
+
+   CLASSPATH_JNI_MD_H and CLASSPATH_JNI_H are defined in config.h.
+
+*******************************************************************************/
+
+#include "config.h"
+
+/* We include both headers with the absolute path so we can be sure
+   that the preprocessor does not take another header.  Furthermore we
+   include jni_md.h before jni.h as the latter includes the former. */
+
+#include INCLUDE_JNI_MD_H
+#include INCLUDE_JNI_H
+
+#ifndef _JNI_HPP
+#define _JNI_HPP
+
+#include <stdint.h>
+
+#include "vm/global.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* CACAO related stuff ********************************************************/
+
+extern const struct JNIInvokeInterface_ _Jv_JNIInvokeInterface;
+extern struct JNINativeInterface_ _Jv_JNINativeInterface;
+
+
+/* hashtable_global_ref_entry *************************************************/
+
+typedef struct hashtable_global_ref_entry hashtable_global_ref_entry;
+
+struct hashtable_global_ref_entry {
+       java_object_t              *o;      /* object pointer of global ref       */
+       int32_t                     refs;   /* references of the current pointer  */
+       hashtable_global_ref_entry *hashlink; /* link for external chaining       */
+};
+
+
+/* function prototypes ********************************************************/
+
+bool jni_init(void);
+bool jni_version_check(int version);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // _JNI_HPP
+
+
+/*
+ * These are local overrides for various environment variables in Emacs.
+ * Please do not remove this and leave it at the end of the file, where
+ * Emacs will automagically detect them.
+ * ---------------------------------------------------------------------
+ * Local variables:
+ * mode: c++
+ * indent-tabs-mode: t
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ * vim:noexpandtab:sw=4:ts=4:
+ */

diff --git a/src/native/jvmti/jvmti.c b/src/native/jvmti/jvmti.c
index 49e7f795c24be6a4e5819a26b70d4631fafeaa0a..1023e385e5c908b37028fe5c61fd600ccaa9e8da 100644 (file)
--- a/src/native/jvmti/jvmti.c
+++ b/src/native/jvmti/jvmti.c
@@ -36,7 +36,7 @@
 #include <unistd.h>
 #include <sched.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 #include "native/jvmti/cacaodbg.h"
 #include "native/jvmti/jvmti.h"

diff --git a/src/native/jvmti/jvmti.h b/src/native/jvmti/jvmti.h
index b0774abb289b260ef83c63b1c13dc91b49e2664b..576c7ee2b0643a315c75a8e10507e0d077025ca4 100644 (file)
--- a/src/native/jvmti/jvmti.h
+++ b/src/native/jvmti/jvmti.h
@@ -1,10 +1,8 @@
 /* src/native/jvmti.c - implementation of the Java Virtual Machine Tool 
                         Interface functions
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -23,19 +21,15 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Author: Martin Platter
-
-   Changes:             
+*/
 
-   
 
-*/
 #ifndef _JVMTI_H
 #define _JVMTI_H
 
-#include "native/jni.h"
+#include "config.h"
+
+#include "native/jni.hpp"
 
 
 #define JVMTI_VERSION_INTERFACE_JNI   0x00000000

diff --git a/src/native/native.c b/src/native/native.c
index f1aca471296ac464d06e74cbc764d2de8311edac..e55452bee087e494e6fe96e6ce28e882c76fd9c9 100644 (file)
--- a/src/native/native.c
+++ b/src/native/native.c
@@ -34,7 +34,7 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #include "native/vm/nativevm.h"

diff --git a/src/native/native.h b/src/native/native.h
index a2d355691bd890552cba191cbd52c2756221be6f..bcafba5ba9e702077a1c394a430ef80c552fe0e5 100644 (file)
--- a/src/native/native.h
+++ b/src/native/native.h
@@ -34,7 +34,7 @@
 extern "C" {
 #endif
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 
 #include "vm/class.h"
 #include "vm/global.h"

diff --git a/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.cpp b/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.cpp
index a262ca46fadd8fc70b4940ee97bbfef50b447392..0297755d5a8380e04e98a3c06d2eeda95e78074f 100644 (file)
--- a/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.cpp
+++ b/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.cpp
@@ -33,7 +33,7 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.cpp b/src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.cpp
index 9373b6b92f9650ab7300af230bbde22ab5f4e27e..9d2058b5ac058f83bfbe6192b5ddf1c2669ae090 100644 (file)
--- a/src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.cpp
+++ b/src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.cpp
@@ -36,7 +36,7 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/cldc1.1/com_sun_cldchi_io_ConsoleOutputStream.cpp b/src/native/vm/cldc1.1/com_sun_cldchi_io_ConsoleOutputStream.cpp
index 8fcae40d78ef7300007d0999a06c7fa6f33f8a4d..d3b4b1c2de9be73da2be83f0e1ce7031fb86ae99 100644 (file)
--- a/src/native/vm/cldc1.1/com_sun_cldchi_io_ConsoleOutputStream.cpp
+++ b/src/native/vm/cldc1.1/com_sun_cldchi_io_ConsoleOutputStream.cpp
@@ -30,7 +30,7 @@
 
 #include "vm/types.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/cldc1.1/com_sun_cldchi_jvm_JVM.cpp b/src/native/vm/cldc1.1/com_sun_cldchi_jvm_JVM.cpp
index 3416c45c6891cdff512ccae695fc5ef15c957f21..02399192c56674260dd70f1c11f672f23c4ba99c 100644 (file)
--- a/src/native/vm/cldc1.1/com_sun_cldchi_jvm_JVM.cpp
+++ b/src/native/vm/cldc1.1/com_sun_cldchi_jvm_JVM.cpp
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/cldc1.1/java_lang_Class.cpp b/src/native/vm/cldc1.1/java_lang_Class.cpp
index 49d459da799f5b20e1c3626e4e38a8a9c440745c..cdfe87c5677d3171a1e4c1bb4425b8feed71ebfc 100644 (file)
--- a/src/native/vm/cldc1.1/java_lang_Class.cpp
+++ b/src/native/vm/cldc1.1/java_lang_Class.cpp
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/cldc1.1/java_lang_Double.cpp b/src/native/vm/cldc1.1/java_lang_Double.cpp
index 772b603caa62d89473b6ba4d1b965fe8cf526fa3..2f5903c04d957f4820f435e3b632cf90dd67dcb1 100644 (file)
--- a/src/native/vm/cldc1.1/java_lang_Double.cpp
+++ b/src/native/vm/cldc1.1/java_lang_Double.cpp
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/cldc1.1/java_lang_Float.cpp b/src/native/vm/cldc1.1/java_lang_Float.cpp
index bea50c0c5fac47cea35e91545de5b2946904dc22..709c11a6434847cf0264bf9cf03059b7832fbda0 100644 (file)
--- a/src/native/vm/cldc1.1/java_lang_Float.cpp
+++ b/src/native/vm/cldc1.1/java_lang_Float.cpp
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/cldc1.1/java_lang_Math.cpp b/src/native/vm/cldc1.1/java_lang_Math.cpp
index f65adb551f4264ae7fb93bc408f8533ea503535f..8ca741ecb18d3f269f8868c6dcc109cca8ba7827 100644 (file)
--- a/src/native/vm/cldc1.1/java_lang_Math.cpp
+++ b/src/native/vm/cldc1.1/java_lang_Math.cpp
@@ -29,7 +29,7 @@
 
 #include "fdlibm/fdlibm.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/cldc1.1/java_lang_Object.cpp b/src/native/vm/cldc1.1/java_lang_Object.cpp
index 83d6df8668ab604154ab400ef6a21cf658e7d6ae..f302cea182cb041e7a4c3d8b7565974652040cc9 100644 (file)
--- a/src/native/vm/cldc1.1/java_lang_Object.cpp
+++ b/src/native/vm/cldc1.1/java_lang_Object.cpp
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/cldc1.1/java_lang_Runtime.cpp b/src/native/vm/cldc1.1/java_lang_Runtime.cpp
index fce3463edf4d663c9c017b1f8863a3b812e7e9be..62c6c48fb9cf731cf60c9196f218093713895068 100644 (file)
--- a/src/native/vm/cldc1.1/java_lang_Runtime.cpp
+++ b/src/native/vm/cldc1.1/java_lang_Runtime.cpp
@@ -29,7 +29,7 @@
 
 #include "mm/gc.hpp"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/cldc1.1/java_lang_String.cpp b/src/native/vm/cldc1.1/java_lang_String.cpp
index e0cb3517b9c26585f815a14ec6c70d53aadd998d..921ae0d7086c3542c142a2f9a3c08667bf193d23 100644 (file)
--- a/src/native/vm/cldc1.1/java_lang_String.cpp
+++ b/src/native/vm/cldc1.1/java_lang_String.cpp
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/cldc1.1/java_lang_System.cpp b/src/native/vm/cldc1.1/java_lang_System.cpp
index e334d9b38e0386c3e8aab9f994b7d6b85e6117fa..7ed1e7563ae71d9562fc7c8b3f887db920011e04 100644 (file)
--- a/src/native/vm/cldc1.1/java_lang_System.cpp
+++ b/src/native/vm/cldc1.1/java_lang_System.cpp
@@ -30,7 +30,7 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/cldc1.1/java_lang_Thread.cpp b/src/native/vm/cldc1.1/java_lang_Thread.cpp
index 5ee1120313cb61a2192642e0d3e05494521bb943..4b60d0989d7f14d8d30422410d913daac3295eb4 100644 (file)
--- a/src/native/vm/cldc1.1/java_lang_Thread.cpp
+++ b/src/native/vm/cldc1.1/java_lang_Thread.cpp
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/cldc1.1/java_lang_Throwable.cpp b/src/native/vm/cldc1.1/java_lang_Throwable.cpp
index 10993c0610c9fa181805eda40e7faef2c279f0b4..d839f09c42c7e7b38f258d550275b390a68175ec 100644 (file)
--- a/src/native/vm/cldc1.1/java_lang_Throwable.cpp
+++ b/src/native/vm/cldc1.1/java_lang_Throwable.cpp
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/gnuclasspath/gnu_classpath_VMStackWalker.cpp b/src/native/vm/gnuclasspath/gnu_classpath_VMStackWalker.cpp
index ee0646a78945da921d5661ca92732c454205c60e..b36eaeea482b0b5281002a98290428e7ad6315b9 100644 (file)
--- a/src/native/vm/gnuclasspath/gnu_classpath_VMStackWalker.cpp
+++ b/src/native/vm/gnuclasspath/gnu_classpath_VMStackWalker.cpp
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/gnuclasspath/gnu_classpath_VMSystemProperties.cpp b/src/native/vm/gnuclasspath/gnu_classpath_VMSystemProperties.cpp
index ebd09b0405add9fc83ff1e051b5bda6e41ac685f..82c7f31bd4247fef15dbc901130500c138f30294 100644 (file)
--- a/src/native/vm/gnuclasspath/gnu_classpath_VMSystemProperties.cpp
+++ b/src/native/vm/gnuclasspath/gnu_classpath_VMSystemProperties.cpp
@@ -32,7 +32,7 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/gnuclasspath/gnu_classpath_jdwp_VMFrame.c b/src/native/vm/gnuclasspath/gnu_classpath_jdwp_VMFrame.c
index e647e4d940e81a9a47d05b95fcde3f0701693496..9276ebb8feebcbf5fec468178da435e9fc36cf48 100644 (file)
--- a/src/native/vm/gnuclasspath/gnu_classpath_jdwp_VMFrame.c
+++ b/src/native/vm/gnuclasspath/gnu_classpath_jdwp_VMFrame.c
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 
 #include "native/include/java_lang_Object.h"
 #include "native/include/gnu_classpath_jdwp_VMFrame.h"

diff --git a/src/native/vm/gnuclasspath/gnu_classpath_jdwp_VMMethod.c b/src/native/vm/gnuclasspath/gnu_classpath_jdwp_VMMethod.c
index 54ff53478a647926d4dce1029cc3a94d181551c8..dec60350128f393c74ed6dd420b681ff6c6179b2 100644 (file)
--- a/src/native/vm/gnuclasspath/gnu_classpath_jdwp_VMMethod.c
+++ b/src/native/vm/gnuclasspath/gnu_classpath_jdwp_VMMethod.c
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 
 #include "native/include/gnu_classpath_jdwp_VMMethod.h"
 

diff --git a/src/native/vm/gnuclasspath/gnu_classpath_jdwp_VMVirtualMachine.c b/src/native/vm/gnuclasspath/gnu_classpath_jdwp_VMVirtualMachine.c
index 9e06a6b57b737eb72827bb27444d8296e3118aa1..eaf47e6301c3cfea38b5233c8360fbd5f19c5cb4 100644 (file)
--- a/src/native/vm/gnuclasspath/gnu_classpath_jdwp_VMVirtualMachine.c
+++ b/src/native/vm/gnuclasspath/gnu_classpath_jdwp_VMVirtualMachine.c
@@ -29,7 +29,7 @@
 #include <string.h>
 
 #include "toolbox/logging.h"
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/include/java_lang_Thread.h"
 #include "native/include/java_nio_ByteBuffer.h"
 #include "native/include/java_lang_Class.h"

diff --git a/src/native/vm/gnuclasspath/gnu_java_lang_VMCPStringBuilder.cpp b/src/native/vm/gnuclasspath/gnu_java_lang_VMCPStringBuilder.cpp
index 1d4b014ac507970bb46bae7736c460491a1910c9..38b04b5e0b3c68e3640c73077490badb478c17c3 100644 (file)
--- a/src/native/vm/gnuclasspath/gnu_java_lang_VMCPStringBuilder.cpp
+++ b/src/native/vm/gnuclasspath/gnu_java_lang_VMCPStringBuilder.cpp
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/gnuclasspath/gnu_java_lang_management_VMClassLoadingMXBeanImpl.cpp b/src/native/vm/gnuclasspath/gnu_java_lang_management_VMClassLoadingMXBeanImpl.cpp
index 6463a8827407caf7e8e67f3fffc2b16df2c44488..d13cc78d9fdb0da0bc6c6f78cbc36cc45312e029 100644 (file)
--- a/src/native/vm/gnuclasspath/gnu_java_lang_management_VMClassLoadingMXBeanImpl.cpp
+++ b/src/native/vm/gnuclasspath/gnu_java_lang_management_VMClassLoadingMXBeanImpl.cpp
@@ -29,7 +29,7 @@
 
 #include "mm/gc.hpp"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/gnuclasspath/gnu_java_lang_management_VMMemoryMXBeanImpl.cpp b/src/native/vm/gnuclasspath/gnu_java_lang_management_VMMemoryMXBeanImpl.cpp
index a48af390eb6909c6292779b056682313e50ca287..13a1d7775b09d0516233403cdb0061f27e19a056 100644 (file)
--- a/src/native/vm/gnuclasspath/gnu_java_lang_management_VMMemoryMXBeanImpl.cpp
+++ b/src/native/vm/gnuclasspath/gnu_java_lang_management_VMMemoryMXBeanImpl.cpp
@@ -29,7 +29,7 @@
 
 #include "mm/gc.hpp"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/gnuclasspath/gnu_java_lang_management_VMRuntimeMXBeanImpl.cpp b/src/native/vm/gnuclasspath/gnu_java_lang_management_VMRuntimeMXBeanImpl.cpp
index 2b9e3c4e5b20829e56c009d74212e72910942a68..e9895020b992c8f1fc5d07d197fbc50ed5f7fcf2 100644 (file)
--- a/src/native/vm/gnuclasspath/gnu_java_lang_management_VMRuntimeMXBeanImpl.cpp
+++ b/src/native/vm/gnuclasspath/gnu_java_lang_management_VMRuntimeMXBeanImpl.cpp
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/gnuclasspath/gnu_java_lang_management_VMThreadMXBeanImpl.cpp b/src/native/vm/gnuclasspath/gnu_java_lang_management_VMThreadMXBeanImpl.cpp
index e8f3916cbf8821a491b94bd55c80e60724b87cce..e8a600899edfda23e1c99eae66cb188e65361657 100644 (file)
--- a/src/native/vm/gnuclasspath/gnu_java_lang_management_VMThreadMXBeanImpl.cpp
+++ b/src/native/vm/gnuclasspath/gnu_java_lang_management_VMThreadMXBeanImpl.cpp
@@ -29,7 +29,7 @@
 
 #include "mm/gc.hpp"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/gnuclasspath/java_lang_VMClass.cpp b/src/native/vm/gnuclasspath/java_lang_VMClass.cpp
index 70568657fa86ce424324acdc7a51cb0ae0382a75..9298bbc17edab82055e2467ea7c04291b17bcb7c 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_VMClass.cpp
+++ b/src/native/vm/gnuclasspath/java_lang_VMClass.cpp
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/gnuclasspath/java_lang_VMClassLoader.cpp b/src/native/vm/gnuclasspath/java_lang_VMClassLoader.cpp
index 6acc53b5f3641dfff76cbc6f2043de54688d54cd..57f22a8c6398864b844df19ebccdd30956da3069 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_VMClassLoader.cpp
+++ b/src/native/vm/gnuclasspath/java_lang_VMClassLoader.cpp
@@ -31,7 +31,7 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/gnuclasspath/java_lang_VMObject.cpp b/src/native/vm/gnuclasspath/java_lang_VMObject.cpp
index 5b63de218bf63aaa2c61dcf7a19b1dc695a571ff..a671f9b4f1d9a0feb5e5b2fd034f9f301cc07b61 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_VMObject.cpp
+++ b/src/native/vm/gnuclasspath/java_lang_VMObject.cpp
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/gnuclasspath/java_lang_VMRuntime.cpp b/src/native/vm/gnuclasspath/java_lang_VMRuntime.cpp
index 84f13d553f762441f6879afd7f3c2a67e4deb180..43d65b56ac5f930072c80039c21dac45d9ee0f4b 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_VMRuntime.cpp
+++ b/src/native/vm/gnuclasspath/java_lang_VMRuntime.cpp
@@ -42,7 +42,7 @@
 #include "mm/dumpmemory.h"
 #include "mm/gc.hpp"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/gnuclasspath/java_lang_VMString.cpp b/src/native/vm/gnuclasspath/java_lang_VMString.cpp
index 632c429b8fd9ed8ff957a90c5d26788bd3996398..6b1dd3d1726787044dc1ecbe708cf6d6706cb7e9 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_VMString.cpp
+++ b/src/native/vm/gnuclasspath/java_lang_VMString.cpp
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/gnuclasspath/java_lang_VMSystem.cpp b/src/native/vm/gnuclasspath/java_lang_VMSystem.cpp
index fcdc273ae1112b57577bc897487427393943cbe2..6f7cd1b0fc3797d95c6257521c8d4b8513b41d2b 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_VMSystem.cpp
+++ b/src/native/vm/gnuclasspath/java_lang_VMSystem.cpp
@@ -30,7 +30,7 @@
 
 #include "mm/gc.hpp"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/gnuclasspath/java_lang_VMThread.cpp b/src/native/vm/gnuclasspath/java_lang_VMThread.cpp
index dde8384ebf7725826aabb6401e42bd1c331de0a2..1cb86b3a99d543e0a3577d377e340efda7e123f2 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_VMThread.cpp
+++ b/src/native/vm/gnuclasspath/java_lang_VMThread.cpp
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/gnuclasspath/java_lang_VMThrowable.cpp b/src/native/vm/gnuclasspath/java_lang_VMThrowable.cpp
index 64247cdc1fdfb49cc91ad531cca71209d61f3a3e..e8a7f32ac7d3023875c1b6d9c532390b1d847b2e 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_VMThrowable.cpp
+++ b/src/native/vm/gnuclasspath/java_lang_VMThrowable.cpp
@@ -30,7 +30,7 @@
 
 #include "vm/types.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/gnuclasspath/java_lang_management_VMManagementFactory.c b/src/native/vm/gnuclasspath/java_lang_management_VMManagementFactory.c
index 8d1130ae560759b137f3c154acadfb93519d463c..fa4b6dc4d58e9437cf5990042d26fbe624868afa 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_management_VMManagementFactory.c
+++ b/src/native/vm/gnuclasspath/java_lang_management_VMManagementFactory.c
@@ -29,7 +29,7 @@
 
 #include "vm/types.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/gnuclasspath/java_lang_reflect_VMConstructor.cpp b/src/native/vm/gnuclasspath/java_lang_reflect_VMConstructor.cpp
index a22bdacd14e24d1a29c60d9a7ca281a27edcb9f9..756ef407d0ab65494b0ee64c1cff799f2acb05a8 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_reflect_VMConstructor.cpp
+++ b/src/native/vm/gnuclasspath/java_lang_reflect_VMConstructor.cpp
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/gnuclasspath/java_lang_reflect_VMField.cpp b/src/native/vm/gnuclasspath/java_lang_reflect_VMField.cpp
index d30e70312f6c179deb93ffb878a1bb0896a69b76..8a100bbe326e456f67e15e3442a102288eea5904 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_reflect_VMField.cpp
+++ b/src/native/vm/gnuclasspath/java_lang_reflect_VMField.cpp
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/gnuclasspath/java_lang_reflect_VMMethod.cpp b/src/native/vm/gnuclasspath/java_lang_reflect_VMMethod.cpp
index cafb69942680ad1dbb7bb9818f91ecb1a43f3273..561ab3882b3affecf84a0345622b05ea1ed719cd 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_reflect_VMMethod.cpp
+++ b/src/native/vm/gnuclasspath/java_lang_reflect_VMMethod.cpp
@@ -31,7 +31,7 @@
 #include "vm/vm.hpp"
 #endif
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/gnuclasspath/java_lang_reflect_VMProxy.c b/src/native/vm/gnuclasspath/java_lang_reflect_VMProxy.c
index f40678c1489795bc1abe303b2036248d4596bdc6..da0c62bc4039b5257d8a57ab75e89a7b1f1d2789 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_reflect_VMProxy.c
+++ b/src/native/vm/gnuclasspath/java_lang_reflect_VMProxy.c
@@ -27,7 +27,7 @@
 
 #include <stdlib.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 // FIXME

diff --git a/src/native/vm/gnuclasspath/java_security_VMAccessController.cpp b/src/native/vm/gnuclasspath/java_security_VMAccessController.cpp
index abd1ed6c36d745c34de2cfbd640dd69eeec478b0..4ad6e3c7e66ca02c398276dca368d91a77a935c6 100644 (file)
--- a/src/native/vm/gnuclasspath/java_security_VMAccessController.cpp
+++ b/src/native/vm/gnuclasspath/java_security_VMAccessController.cpp
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/gnuclasspath/java_util_concurrent_atomic_AtomicLong.cpp b/src/native/vm/gnuclasspath/java_util_concurrent_atomic_AtomicLong.cpp
index c95ad1845a9da8c14e5c3295079cd477ad3f4981..26ef8a4e4f4ccd72794b71f32ff7d21cd76d47c1 100644 (file)
--- a/src/native/vm/gnuclasspath/java_util_concurrent_atomic_AtomicLong.cpp
+++ b/src/native/vm/gnuclasspath/java_util_concurrent_atomic_AtomicLong.cpp
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #if defined(ENABLE_JNI_HEADERS)

diff --git a/src/native/vm/gnuclasspath/sun_reflect_ConstantPool.cpp b/src/native/vm/gnuclasspath/sun_reflect_ConstantPool.cpp
index ad48b2fda428abbc60a71ba05524588844245219..3b54046650f1ec36e8959c151bd9a4e4f696e021 100644 (file)
--- a/src/native/vm/gnuclasspath/sun_reflect_ConstantPool.cpp
+++ b/src/native/vm/gnuclasspath/sun_reflect_ConstantPool.cpp
@@ -42,7 +42,7 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/openjdk/hpi.c b/src/native/vm/openjdk/hpi.c
index 7b89c594ae59419cf60009127e22c412e62c7e87..4a2a522391464883cf9949012295afa80dc11bb0 100644 (file)
--- a/src/native/vm/openjdk/hpi.c
+++ b/src/native/vm/openjdk/hpi.c
@@ -33,7 +33,7 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/native.h"
 
 #include "native/vm/openjdk/hpi.h"

diff --git a/src/native/vm/openjdk/jvm.cpp b/src/native/vm/openjdk/jvm.cpp
index 8a7a1d768d8a80b3124c725e1dfe34eebd1303fe..2ba79b7c986d842351ef4ff52b4464f46fb28a22 100644 (file)
--- a/src/native/vm/openjdk/jvm.cpp
+++ b/src/native/vm/openjdk/jvm.cpp
@@ -45,7 +45,7 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/reflection.cpp b/src/native/vm/reflection.cpp
index 421467f41ef9a5522358d68901be651c15825474..7377ddf74a191aab1450ac424a8250e1303a4f84 100644 (file)
--- a/src/native/vm/reflection.cpp
+++ b/src/native/vm/reflection.cpp
@@ -27,7 +27,6 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/native/vm/reflection.hpp b/src/native/vm/reflection.hpp
index 39418abe7e12841f1ff5aced322a312770288689..82b8fa6ccd73d885e516271e4cc5f1d0ec2d8a5c 100644 (file)
--- a/src/native/vm/reflection.hpp
+++ b/src/native/vm/reflection.hpp
@@ -30,7 +30,6 @@
 
 #include <stdint.h>
 
-#include "native/jni.h"
 #include "native/native.h"
 
 #include "vm/field.h"

diff --git a/src/native/vm/sun_misc_Unsafe.cpp b/src/native/vm/sun_misc_Unsafe.cpp
index 4544393129cad6fce8386bc8de0dda763fe61e4f..b705e64cb51ac58f9fa73b12db1d2c12e4606e89 100644 (file)
--- a/src/native/vm/sun_misc_Unsafe.cpp
+++ b/src/native/vm/sun_misc_Unsafe.cpp
@@ -32,7 +32,7 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/threads/posix/thread-posix.cpp b/src/threads/posix/thread-posix.cpp
index c896910d34d876b82c442089a50587689390cc7f..7be3cc39023826b079ed965441c79bd7e5ced1c9 100644 (file)
--- a/src/threads/posix/thread-posix.cpp
+++ b/src/threads/posix/thread-posix.cpp
@@ -49,7 +49,6 @@
 # include "mm/cacao-gc/gc.h"
 #endif
 
-#include "native/jni.h"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/threads/thread.cpp b/src/threads/thread.cpp
index 4d4d4c6440d25fe49eed0429647927590400753f..fe00af5d0e5a7d1467952c2d489174e4df1096c9 100644 (file)
--- a/src/threads/thread.cpp
+++ b/src/threads/thread.cpp
@@ -39,7 +39,6 @@
 # include "mm/boehm-gc/include/gc.h"
 #endif
 
-#include "native/jni.h"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/threads/thread.hpp b/src/threads/thread.hpp
index c6336c80afd59dcbdce6334b5adfb8c05529b545..ba5ff0a9e2955422bc1194358ac94f5100cad075 100644 (file)
--- a/src/threads/thread.hpp
+++ b/src/threads/thread.hpp
@@ -43,7 +43,6 @@ extern "C" {
 
 #include "vm/os.hpp"
 
-#include "native/jni.h"
 #include "native/llni.h"
 
 #include "threads/mutex.hpp"

diff --git a/src/vm/builtin.c b/src/vm/builtin.c
index 1ba96a9ec7c7f7ee1eb8983c295038ffe97a4aaf..58b4a5cc09d4cb360ef9de1e394d6775e1bc509d 100644 (file)
--- a/src/vm/builtin.c
+++ b/src/vm/builtin.c
@@ -50,7 +50,6 @@
 #include "mm/gc.hpp"
 #include "mm/memory.h"
 
-#include "native/jni.h"
 #include "native/llni.h"
 
 #include "threads/lock-common.h"

diff --git a/src/vm/classcache.h b/src/vm/classcache.h
index e8286e050d066a1de38dc5112c08d6c08f47a813..470b86c5ed9225dc28944f555a566ae7b6a5b4eb 100644 (file)
--- a/src/vm/classcache.h
+++ b/src/vm/classcache.h
@@ -28,18 +28,10 @@
 
 #include "config.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "vm/types.h"
 
 #include <stdio.h>  /* for FILE */
 
-#if defined(ENABLE_JVMTI)
-# include "native/jni.h"
-#endif
-
 #include "toolbox/hashtable.h"
 
 #include "vm/class.h"
@@ -48,6 +40,10 @@ extern "C" {
 #include "vm/references.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* forward declarations *******************************************************/
 
 typedef struct classcache_name_entry classcache_name_entry;

diff --git a/src/vm/exceptions.cpp b/src/vm/exceptions.cpp
index e97c6e1ffcead23e89222369de6b6a6956cead0b..c70c7980331828983de36196329bbf0b1dea3273 100644 (file)
--- a/src/vm/exceptions.cpp
+++ b/src/vm/exceptions.cpp
@@ -37,7 +37,6 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
 #include "native/llni.h"
 #include "native/native.h"
 

diff --git a/src/vm/jit/alpha/codegen.c b/src/vm/jit/alpha/codegen.c
index 8457be0feb9170065c39ac792281e44cbeea7426..ce26e9fa78b8ad5e839946f4ea82ceadff2d2416 100644 (file)
--- a/src/vm/jit/alpha/codegen.c
+++ b/src/vm/jit/alpha/codegen.c
@@ -38,7 +38,6 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
 #include "native/localref.h"
 #include "native/native.h"
 

diff --git a/src/vm/jit/codegen-common.c b/src/vm/jit/codegen-common.c
index 2cbe198fc9373c7ac79d1b3e45441e695ef74194..35b1bed9bc711e186fba9c8682220763dbc4de23 100644 (file)
--- a/src/vm/jit/codegen-common.c
+++ b/src/vm/jit/codegen-common.c
@@ -57,7 +57,6 @@
 #include "toolbox/list.h"
 #include "toolbox/logging.h"
 
-#include "native/jni.h"
 #include "native/llni.h"
 #include "native/localref.h"
 #include "native/native.h"

diff --git a/src/vm/jit/i386/codegen.c b/src/vm/jit/i386/codegen.c
index d18b645e8a57460f702b4e0fc5af9e3496d7cf23..6138f385fd5b76ac9bedfcd26aad259f2def7b7f 100644 (file)
--- a/src/vm/jit/i386/codegen.c
+++ b/src/vm/jit/i386/codegen.c
@@ -37,7 +37,7 @@
 #include "vm/jit/i386/emit.h"
 
 #include "mm/memory.h"
-#include "native/jni.h"
+
 #include "native/localref.h"
 #include "native/native.h"
 

diff --git a/src/vm/jit/m68k/codegen.c b/src/vm/jit/m68k/codegen.c
index 22e9ea93e5615366bda3f43feefe0729fb667740..446548af82791ed58c79cec86d34adcde76edab7 100644 (file)
--- a/src/vm/jit/m68k/codegen.c
+++ b/src/vm/jit/m68k/codegen.c
@@ -35,7 +35,7 @@
 #include "vm/jit/m68k/emit.h"
 
 #include "mm/memory.h"
-#include "native/jni.h"
+
 #include "native/localref.h"
 #include "native/native.h"
 

diff --git a/src/vm/jit/s390/codegen.c b/src/vm/jit/s390/codegen.c
index 72e5bc3c3d47ad62791ae7d5dd91a08f0f8da244..f7290916181c97651f064c9a720273c772c431b7 100644 (file)
--- a/src/vm/jit/s390/codegen.c
+++ b/src/vm/jit/s390/codegen.c
@@ -34,7 +34,6 @@
 #include "vm/jit/s390/emit.h"
 #include "vm/jit/s390/md-abi.h"
 
-#include "native/jni.h"
 #include "native/localref.h"
 #include "native/native.h"
 

diff --git a/src/vm/jit/sparc64/codegen.c b/src/vm/jit/sparc64/codegen.c
index 6364dbd51fd31266ccee09f31729f5f49620901f..fc5cba71fcaa7bcd8de657783632883811ec80ec 100644 (file)
--- a/src/vm/jit/sparc64/codegen.c
+++ b/src/vm/jit/sparc64/codegen.c
@@ -39,7 +39,6 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
 #include "native/localref.h"
 #include "native/native.h"
 

diff --git a/src/vm/jit/stacktrace.cpp b/src/vm/jit/stacktrace.cpp
index d58427ac4cf20f033dc83934ad4d4a46c0b003d8..8a6f44d17a04cf0f5236c2a3c20928a3b3f0ffe1 100644 (file)
--- a/src/vm/jit/stacktrace.cpp
+++ b/src/vm/jit/stacktrace.cpp
@@ -39,8 +39,6 @@
 
 #include "vm/jit/stacktrace.hpp"
 
-#include "vm/global.h"                   /* required here for native includes */
-#include "native/jni.h"
 #include "native/llni.h"
 
 #include "threads/thread.hpp"

diff --git a/src/vm/jit/trace.cpp b/src/vm/jit/trace.cpp
index 3a138e5ad5dcd8665020dad203de237b0bc6eab9..28bca18a30a6414f4302fe563f0c8c91783e16b4 100644 (file)
--- a/src/vm/jit/trace.cpp
+++ b/src/vm/jit/trace.cpp
@@ -32,7 +32,6 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
 #include "native/llni.h"
 
 #include "threads/thread.hpp"

diff --git a/src/vm/jit/x86_64/codegen.c b/src/vm/jit/x86_64/codegen.c
index 680c82650f30e4b871a31c5c9d07386519230558..7be6ad90058875f0819472d3c45ae5594149a139 100644 (file)
--- a/src/vm/jit/x86_64/codegen.c
+++ b/src/vm/jit/x86_64/codegen.c
@@ -39,7 +39,6 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
 #include "native/localref.h"
 #include "native/native.h"
 

diff --git a/src/vm/options.c b/src/vm/options.c
index 42adb3f909c86005de44022c4b3444fe839f1bd5..68def40bcc0ede872830e103c699099fc3a48f84 100644 (file)
--- a/src/vm/options.c
+++ b/src/vm/options.c
@@ -32,8 +32,6 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
-
 #include "vm/options.h"
 #include "vm/os.hpp"
 #include "vm/vm.hpp"

diff --git a/src/vm/options.h b/src/vm/options.h
index 40da2a9b5e9731697c3564ce25912647195b7a9d..09738742b582d2c5185f891c83d166846667652f 100644 (file)
--- a/src/vm/options.h
+++ b/src/vm/options.h
@@ -36,7 +36,7 @@ extern "C" {
 
 #include "vm/types.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 
 #include "vm/global.h"
 

diff --git a/src/vm/package.cpp b/src/vm/package.cpp
index 5e5d3b2004ef910b911f256ce371dac47813d0a0..966046e69e3c768bb95ef4605021d3b19028cc7f 100644 (file)
--- a/src/vm/package.cpp
+++ b/src/vm/package.cpp
@@ -31,8 +31,6 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
-
 #include "vm/options.h"
 #include "vm/package.hpp"
 #include "vm/string.hpp"

diff --git a/src/vm/package.hpp b/src/vm/package.hpp
index 38b129a6dbb598159115e623fa0b87cc688bd012..e50e275ac20813565f971e8491ecd3d0e5c3e22c 100644 (file)
--- a/src/vm/package.hpp
+++ b/src/vm/package.hpp
@@ -28,19 +28,9 @@
 
 #include "config.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdint.h>
 
-#include "native/jni.h"
-
-#include "vm/global.h"
-
-#ifdef __cplusplus
-}
-#endif
+#include "vm/utf8.h"
 
 
 #ifdef __cplusplus

diff --git a/src/vm/primitive.cpp b/src/vm/primitive.cpp
index 2b1b27a621f915ffd16096a54afa925fa0b7c1be..e20334cc00efa591e414675fdad59f68b428fd9e 100644 (file)
--- a/src/vm/primitive.cpp
+++ b/src/vm/primitive.cpp
@@ -28,7 +28,6 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include "native/jni.h"
 #include "native/llni.h"
 
 #include "vm/builtin.h"

diff --git a/src/vm/properties.c b/src/vm/properties.c
index 33090078164d16d4c8889d58d2cd4e2a324c1777..10f2a793a48b1dcaeaf4dd6f408bbd97d5fa3003 100644 (file)
--- a/src/vm/properties.c
+++ b/src/vm/properties.c
@@ -35,7 +35,6 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
 #include "native/llni.h"
 
 #include "toolbox/list.h"

diff --git a/src/vm/string.cpp b/src/vm/string.cpp
index 71224d06b9389768353e857f39108c54f78db1e0..a6b7c08c3c1024cfd2735adf4d1785415e63e8f0 100644 (file)
--- a/src/vm/string.cpp
+++ b/src/vm/string.cpp
@@ -35,7 +35,6 @@
 
 #include "mm/memory.h"
 
-#include "native/jni.h"
 #include "native/llni.h"
 
 #include "threads/lock-common.h"

diff --git a/src/vm/vm.cpp b/src/vm/vm.cpp
index cfe607a68a1931a1163d0377def097379d0b00ff..0335c5f971beccbdcf98f35f2c0b69df84926154 100644 (file)
--- a/src/vm/vm.cpp
+++ b/src/vm/vm.cpp
@@ -44,7 +44,7 @@
 #include "mm/gc.hpp"
 #include "mm/memory.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 #include "native/llni.h"
 #include "native/localref.h"
 #include "native/native.h"

diff --git a/src/vm/vm.hpp b/src/vm/vm.hpp
index e074b7a48fa0e7982adde16b4dd16b356b2543a0..751de80a295a7e54c3f7c30a3b17d824ea225119 100644 (file)
--- a/src/vm/vm.hpp
+++ b/src/vm/vm.hpp
@@ -33,7 +33,7 @@
 
 #include "vm/types.h"
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 
 #include "vm/global.h"
 

diff --git a/tests/regression/native/checkjni.c b/tests/regression/native/checkjni.c
index 62a57afe71e6fcfde6771adacdf1e1027ddf3070..68337d49ee1d958b82d7e8cf034ec58696795c51 100644 (file)
--- a/tests/regression/native/checkjni.c
+++ b/tests/regression/native/checkjni.c
@@ -1,9 +1,7 @@
 /* src/tests/native/checkjni.c - for testing JNI stuff
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   TU Wien
+   Copyright (C) 1996-2005, 2006, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,20 +20,15 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   Changes:
-
 */
 
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 
-#include "config.h"
-#include "native/jni.h"
+#include "native/jni.hpp"
 
 
 JNIEXPORT jboolean JNICALL Java_checkjni_IsAssignableFrom(JNIEnv *env, jclass clazz, jclass sub, jclass sup)

diff --git a/tests/regression/native/test.c b/tests/regression/native/test.c
index 3d568f66dafa9fb825abdc49f18843d76225996d..f6a0777496511cfb5bfd400897ef948763c57c6c 100644 (file)
--- a/tests/regression/native/test.c
+++ b/tests/regression/native/test.c
@@ -1,9 +1,7 @@
 /* tests/native/test.c - for testing native stuff
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   TU Wien
+   Copyright (C) 1996-2005, 2006, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,18 +20,14 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-
 */
 
 
+#include "config.h"
+
 #include <stdio.h>
 
-#include "config.h"
-#include "native/jni.h"
+#include "native/jni.hpp"
 
 
 JNIEXPORT void JNICALL Java_test_nsub(JNIEnv *env, jclass clazz)

diff --git a/tests/regression/native/testarguments.c b/tests/regression/native/testarguments.c
index bc7be27c52c0de4bf940e988039fa4b3545a9640..8c95c8a697aa66acc75fe46c6c6723717ad0d8d0 100644 (file)
--- a/tests/regression/native/testarguments.c
+++ b/tests/regression/native/testarguments.c
@@ -1,9 +1,7 @@
 /* tests/regression/native/testarguments.c - tests argument passing
 
-   Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   TU Wien
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -30,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "native/jni.h"
+#include "native/jni.hpp"
 
 
 JNIEXPORT jobject JNICALL Java_testarguments_adr(JNIEnv *env, jclass clazz, jint i)

diff --git a/tests/regression/native/testgetobjectclass0.c b/tests/regression/native/testgetobjectclass0.c
index 2bce8e1f10a09e0c9bf956ff03d689497b958e3e..961025bf4b46dda946f8ef95a9d3f03c6e8ae68c 100644 (file)
--- a/tests/regression/native/testgetobjectclass0.c
+++ b/tests/regression/native/testgetobjectclass0.c
@@ -1,9 +1,7 @@
 /* tests/native/testgetobjectclass0.c - tests argument passing
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   TU Wien
+   Copyright (C) 1996-2005, 2006, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,16 +20,11 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Joseph Wenninger
-
-
 */
 
 
 #include "config.h"
-#include "native/jni.h"
+#include "native/jni.hpp"
 
 
 JNIEXPORT void JNICALL Java_testgetobjectclass0_getobjectclass0(JNIEnv *env, jclass clazz)