Merged trunk and subtype.

[cacao.git] / src / native / vm / nativevm.h

diff --git a/src/native/vm/nativevm.h b/src/native/vm/nativevm.h
index 17e49446ace136a9a660718cc739264ced6661ca..de4ba48a101b0fb4a320bd7ecf630e4cd04cbf57 100644 (file)
--- a/src/native/vm/nativevm.h
+++ b/src/native/vm/nativevm.h
@@ -1,9 +1,7 @@
 /* src/native/vm/nativevm.h - register the native functions
 
-   Copyright (C) 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,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -29,6 +27,11 @@
 #define _NATIVEVM_H
 
 #include "config.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "vm/types.h"
 
 #include "vm/global.h"
@@ -36,15 +39,15 @@
 
 /* function prototypes ********************************************************/
 
-bool nativevm_preinit(void);
-bool nativevm_init(void);
+void nativevm_preinit(void);
+void nativevm_init(void);
 
 #if defined(ENABLE_JAVASE)
-
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
 
 void _Jv_gnu_classpath_VMStackWalker_init();
 void _Jv_gnu_classpath_VMSystemProperties_init();
+void _Jv_gnu_java_lang_VMCPStringBuilder_init();
 void _Jv_gnu_java_lang_management_VMClassLoadingMXBeanImpl_init();
 void _Jv_gnu_java_lang_management_VMMemoryMXBeanImpl_init();
 void _Jv_gnu_java_lang_management_VMRuntimeMXBeanImpl_init();
@@ -58,9 +61,9 @@ void _Jv_java_lang_VMSystem_init();
 void _Jv_java_lang_VMThread_init();
 void _Jv_java_lang_VMThrowable_init();
 void _Jv_java_lang_management_VMManagementFactory_init();
-void _Jv_java_lang_reflect_Constructor_init();
-void _Jv_java_lang_reflect_Field_init();
-void _Jv_java_lang_reflect_Method_init();
+void _Jv_java_lang_reflect_VMConstructor_init();
+void _Jv_java_lang_reflect_VMField_init();
+void _Jv_java_lang_reflect_VMMethod_init();
 void _Jv_java_lang_reflect_VMProxy_init();
 void _Jv_java_security_VMAccessController_init();
 void _Jv_java_util_concurrent_atomic_AtomicLong_init();
@@ -70,14 +73,12 @@ void _Jv_sun_misc_Unsafe_init();
 void _Jv_sun_reflect_ConstantPool_init();
 #endif
 
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
 
 void _Jv_sun_misc_Unsafe_init();
 
 # else
-
 #  error unknown classpath configuration
-
 # endif
 
 #elif defined(ENABLE_JAVAME_CLDC1_1)
@@ -98,13 +99,16 @@ void _Jv_java_lang_Thread_init();
 void _Jv_java_lang_Throwable_init();
 
 #else
-
 # error unknown Java configuration
+#endif
 
+#ifdef __cplusplus
+}
 #endif
 
 #endif /* _NATIVEVM_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