From: Christian Thalinger Date: Tue, 12 Aug 2008 15:06:17 +0000 (+0200) Subject: * src/native/jni.h: Removed. X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=cacao.git;a=commitdiff_plain;h=1e6a75a4a4b61583a8869ebe8752120764ca2aef * 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 e1ad41630..08a0ff895 100644 --- 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 facd048b9..f18f9c2d4 100644 --- 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 842840bdc..e0f5445d2 100644 --- 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 index aacd85041..000000000 --- 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 index 000000000..90dc82ca6 --- /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 + +#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 49e7f795c..1023e385e 100644 --- a/src/native/jvmti/jvmti.c +++ b/src/native/jvmti/jvmti.c @@ -36,7 +36,7 @@ #include #include -#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 b0774abb2..576c7ee2b 100644 --- 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 f1aca4712..e55452bee 100644 --- 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 a2d355691..bcafba5ba 100644 --- 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 a262ca46f..0297755d5 100644 --- 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 9373b6b92..9d2058b5a 100644 --- 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 8fcae40d7..d3b4b1c2d 100644 --- 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 3416c45c6..02399192c 100644 --- 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 -#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 49d459da7..cdfe87c56 100644 --- 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 -#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 772b603ca..2f5903c04 100644 --- 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 -#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 bea50c0c5..709c11a64 100644 --- 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 -#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 f65adb551..8ca741ecb 100644 --- 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 83d6df866..f302cea18 100644 --- 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 #include -#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 fce3463ed..62c6c48fb 100644 --- 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 e0cb3517b..921ae0d70 100644 --- 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 #include -#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 e334d9b38..7ed1e7563 100644 --- 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 5ee112031..4b60d0989 100644 --- 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 -#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 10993c061..d839f09c4 100644 --- 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 #include -#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 ee0646a78..b36eaeea4 100644 --- a/src/native/vm/gnuclasspath/gnu_classpath_VMStackWalker.cpp +++ b/src/native/vm/gnuclasspath/gnu_classpath_VMStackWalker.cpp @@ -27,7 +27,7 @@ #include -#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 ebd09b040..82c7f31bd 100644 --- 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 e647e4d94..9276ebb8f 100644 --- 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 -#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 54ff53478..dec603501 100644 --- 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 -#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 9e06a6b57..eaf47e630 100644 --- 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 #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 1d4b014ac..38b04b5e0 100644 --- 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 -#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 6463a8827..d13cc78d9 100644 --- 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 a48af390e..13a1d7775 100644 --- 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 2b9e3c4e5..e9895020b 100644 --- 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 -#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 e8f3916cb..e8a600899 100644 --- 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 70568657f..9298bbc17 100644 --- a/src/native/vm/gnuclasspath/java_lang_VMClass.cpp +++ b/src/native/vm/gnuclasspath/java_lang_VMClass.cpp @@ -27,7 +27,7 @@ #include -#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 6acc53b5f..57f22a8c6 100644 --- 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 5b63de218..a671f9b4f 100644 --- a/src/native/vm/gnuclasspath/java_lang_VMObject.cpp +++ b/src/native/vm/gnuclasspath/java_lang_VMObject.cpp @@ -27,7 +27,7 @@ #include -#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 84f13d553..43d65b56a 100644 --- 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 632c429b8..6b1dd3d17 100644 --- a/src/native/vm/gnuclasspath/java_lang_VMString.cpp +++ b/src/native/vm/gnuclasspath/java_lang_VMString.cpp @@ -28,7 +28,7 @@ #include #include -#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 fcdc273ae..6f7cd1b0f 100644 --- 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 dde8384eb..1cb86b3a9 100644 --- a/src/native/vm/gnuclasspath/java_lang_VMThread.cpp +++ b/src/native/vm/gnuclasspath/java_lang_VMThread.cpp @@ -27,7 +27,7 @@ #include -#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 64247cdc1..e8a7f32ac 100644 --- 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 8d1130ae5..fa4b6dc4d 100644 --- 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 a22bdacd1..756ef407d 100644 --- 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 #include -#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 d30e70312..8a100bbe3 100644 --- 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 #include -#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 cafb69942..561ab3882 100644 --- 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 f40678c14..da0c62bc4 100644 --- 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 -#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 abd1ed6c3..4ad6e3c7e 100644 --- a/src/native/vm/gnuclasspath/java_security_VMAccessController.cpp +++ b/src/native/vm/gnuclasspath/java_security_VMAccessController.cpp @@ -27,7 +27,7 @@ #include -#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 c95ad1845..26ef8a4e4 100644 --- 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 -#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 ad48b2fda..3b5404665 100644 --- 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 7b89c594a..4a2a52239 100644 --- 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 8a7a1d768..2ba79b7c9 100644 --- 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 421467f41..7377ddf74 100644 --- a/src/native/vm/reflection.cpp +++ b/src/native/vm/reflection.cpp @@ -27,7 +27,6 @@ #include -#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 39418abe7..82b8fa6cc 100644 --- a/src/native/vm/reflection.hpp +++ b/src/native/vm/reflection.hpp @@ -30,7 +30,6 @@ #include -#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 454439312..b705e64cb 100644 --- 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 c896910d3..7be3cc390 100644 --- 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 4d4d4c644..fe00af5d0 100644 --- 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 c6336c80a..ba5ff0a9e 100644 --- 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 1ba96a9ec..58b4a5cc0 100644 --- 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 e8286e050..470b86c5e 100644 --- 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 /* 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 e97c6e1ff..c70c79803 100644 --- 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 8457be0fe..ce26e9fa7 100644 --- 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 2cbe198fc..35b1bed9b 100644 --- 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 d18b645e8..6138f385f 100644 --- 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 22e9ea93e..446548af8 100644 --- 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 72e5bc3c3..f72909161 100644 --- 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 6364dbd51..fc5cba71f 100644 --- 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 d58427ac4..8a6f44d17 100644 --- 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 3a138e5ad..28bca18a3 100644 --- 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 680c82650..7be6ad900 100644 --- 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 42adb3f90..68def40bc 100644 --- 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 40da2a9b5..09738742b 100644 --- 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 5e5d3b200..966046e69 100644 --- 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 38b129a6d..e50e275ac 100644 --- a/src/vm/package.hpp +++ b/src/vm/package.hpp @@ -28,19 +28,9 @@ #include "config.h" -#ifdef __cplusplus -extern "C" { -#endif - #include -#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 2b1b27a62..e20334cc0 100644 --- a/src/vm/primitive.cpp +++ b/src/vm/primitive.cpp @@ -28,7 +28,6 @@ #include #include -#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 330900781..10f2a793a 100644 --- 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 71224d06b..a6b7c08c3 100644 --- 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 cfe607a68..0335c5f97 100644 --- 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 e074b7a48..751de80a2 100644 --- 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 62a57afe7..68337d49e 100644 --- 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 #include -#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 3d568f66d..f6a077749 100644 --- 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 -#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 bc7be27c5..8c95c8a69 100644 --- 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 #include -#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 2bce8e1f1..961025bf4 100644 --- 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)