From: Michael Starzinger <michi@complang.tuwien.ac.at>
Date: Mon, 16 Mar 2009 19:45:58 +0000 (+0100)
Subject: Merged with michi branch at rev 1684fe51cf3d.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=cacao.git;a=commitdiff_plain;h=6e920e48a314cfed80ff5db1b026c28049cba600

Merged with michi branch at rev 1684fe51cf3d.
---

6e920e48a314cfed80ff5db1b026c28049cba600
diff --cc src/vm/vm.cpp
index 8cbc0ed5c,497d75490..23518fd85
--- a/src/vm/vm.cpp
+++ b/src/vm/vm.cpp
@@@ -1577,24 -1617,11 +1577,11 @@@ void VM::print_run_time_config(
  
  void vm_run(JavaVM *vm, JavaVMInitArgs *vm_args)
  {
- 	char*                      option;
- 	char*                      mainname;
- 	char*                      p;
- 	utf                       *mainutf;
- 	classinfo                 *mainclass;
- 	java_handle_t             *e;
- 	methodinfo                *m;
- 	java_handle_objectarray_t *oa; 
- 	s4                         oalength;
- 	utf                       *u;
- 	java_handle_t             *s;
- 	int                        status;
- 
- 	// Prevent compiler warnings.
- 	oa = NULL;
+ 	methodinfo* m;
+ 	int         status;
  
  #if !defined(NDEBUG)
 -	if (compileall) {
 +	if (opt_CompileAll) {
  		vm_compile_all();
  		return;
  	}