From 913385abdc1bc57f73744d2fec0a4fce7a2b839d Mon Sep 17 00:00:00 2001 From: Michael Starzinger Date: Wed, 28 Oct 2009 10:31:58 +0100 Subject: [PATCH 1/1] * src/vm/vm.cpp (usage): Made function static. Also removed legacy C functions. * src/vm/vm.hpp: Removed obsolete prototypes. --- src/vm/vm.cpp | 6 +----- src/vm/vm.hpp | 7 ------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/vm/vm.cpp b/src/vm/vm.cpp index bfff3db1e..384018e33 100644 --- a/src/vm/vm.cpp +++ b/src/vm/vm.cpp @@ -390,7 +390,7 @@ opt_struct opts[] = { *******************************************************************************/ -void usage(void) +static void usage(void) { puts("Usage: cacao [-options] classname [arguments]"); puts(" (to run a class file)"); @@ -2508,11 +2508,7 @@ java_handle_t *vm_call_method_objectarray(methodinfo *m, java_handle_t *o, extern "C" { -JavaVM* VM_get_javavm() { return VM::get_current()->get_javavm(); } JNIEnv* VM_get_jnienv() { return VM::get_current()->get_jnienv(); } -bool VM_is_initializing() { return VM::get_current()->is_initializing(); } -bool VM_is_created() { return VM::get_current()->is_created(); } -int64_t VM_get_starttime() { return VM::get_current()->get_starttime(); } void vm_abort(const char* text, ...) { diff --git a/src/vm/vm.hpp b/src/vm/vm.hpp index 901f58201..0430fa4d6 100644 --- a/src/vm/vm.hpp +++ b/src/vm/vm.hpp @@ -121,11 +121,7 @@ private: #else -JavaVM* VM_get_javavm(); JNIEnv* VM_get_jnienv(); -bool VM_is_initializing(); -bool VM_is_created(); -int64_t VM_get_starttime(); #endif @@ -161,9 +157,6 @@ extern uint8_t* intrp_main_stack; extern "C" { #endif -void usage(void); - -bool vm_create(JavaVMInitArgs *vm_args); void vm_run(JavaVM *vm, JavaVMInitArgs *vm_args); int32_t vm_destroy(JavaVM *vm); void vm_exit(int32_t status); -- 2.25.1