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 6ed7acbfcc842ef391aa72675fff137e15a33ae5..de4ba48a101b0fb4a320bd7ecf630e4cd04cbf57 100644 (file)
--- a/src/native/vm/nativevm.h
+++ b/src/native/vm/nativevm.h
@@ -27,6 +27,11 @@
 #define _NATIVEVM_H
 
 #include "config.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "vm/types.h"
 
 #include "vm/global.h"
@@ -38,7 +43,7 @@ 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();
@@ -68,7 +73,7 @@ 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();
 
@@ -97,8 +102,13 @@ void _Jv_java_lang_Throwable_init();
 # 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