Merged with tip.

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

diff --git a/src/vm/vm.h b/src/vm/vm.h
index 28779ba43bb6c2f1bfeb4b138956ddd25bbe1ef7..a669d89dafcccdc58c75b57eace90888aff87430 100644 (file)
--- a/src/vm/vm.h
+++ b/src/vm/vm.h
@@ -40,6 +40,9 @@
 #include "vmcore/class.h"
 #include "vmcore/method.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* export global variables ****************************************************/
 
@@ -47,11 +50,9 @@ extern _Jv_JavaVM *_Jv_jvm;
 extern _Jv_JNIEnv *_Jv_env;
 
 extern bool vm_initializing;
+extern bool vm_created;
 extern bool vm_exiting;
 
-extern char      *mainstring;
-extern classinfo *mainclass;
-
 #if defined(ENABLE_INTRP)
 extern u1 *intrp_main_stack;
 #endif
@@ -101,8 +102,13 @@ double  vm_call_method_double_jvalue(methodinfo *m, java_handle_t *o, const jval
 
 java_handle_t *vm_call_method_objectarray(methodinfo *m, java_handle_t *o, java_handle_objectarray_t *params);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _VM_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