- include stacktrace.h

- warning fixes

diff --git a/src/native/vm/VMSecurityManager.c b/src/native/vm/VMSecurityManager.c
index 228def9703ce249cbbc4b88fa52ce09bf42bf03a..6cd619290b3ea87ac3fec78418777b588c477e13 100644 (file)
--- a/src/native/vm/VMSecurityManager.c
+++ b/src/native/vm/VMSecurityManager.c
@@ -28,16 +28,19 @@
 
    Changes: Joseph Wenninger
 
-   $Id: VMSecurityManager.c 1683 2004-12-05 21:33:36Z jowenn $
+   $Id: VMSecurityManager.c 1697 2004-12-06 12:33:42Z twisti $
 
 */
 
+
 #include "native/jni.h"
 #include "native/native.h"
 #include "native/include/java_lang_ClassLoader.h"
 #include "toolbox/logging.h"
 #include "vm/builtin.h"
 #include "vm/tables.h"
+#include "vm/jit/stacktrace.h"
+
 
 /*
  * Class:     java/lang/SecurityManager
@@ -52,7 +55,7 @@ JNIEXPORT java_lang_ClassLoader* JNICALL Java_java_lang_VMSecurityManager_curren
                return NULL;
 
 #if defined(__I386__) || defined(__ALPHA__)
-       return cacao_currentClassLoader();
+       return (java_lang_ClassLoader *) cacao_currentClassLoader();
 #else
        return 0;
 #endif
@@ -90,7 +93,8 @@ java_objectarray* temporaryGetClassContextHelper(methodinfo *m) {
        if (!(m->class)) log_text("method or block has no class");
        else
        utf_display(m->class->name);
-       printf("\n");  
+       printf("\n");
+       return NULL;
 #if 0
   log_text("temporaryGetClassContextHelper called");
   if (adr==0) log_text("NO REAL METHOD");
@@ -109,15 +113,17 @@ java_objectarray* temporaryGetClassContextHelper(methodinfo *m) {
        printf("saveflt:%ld\n",(long)(*(adr-1)));
   }
   log_text("temporaryGetClassContextHelper leaving");
-  return (java_objectarray *) builtin_newarray(0, class_array_of(class_java_lang_Class)->vftbl);       
+  return (java_objectarray *) builtin_newarray(0, class_array_of(class_java_lang_Class)->vftbl);
 #endif
 }
 
+
 java_objectarray* temporaryGetClassContextHelper2() {
   log_text("temporaryGetClassContextHelper2 called");
   return (java_objectarray *) builtin_newarray(0, class_array_of(class_java_lang_Class)->vftbl);       
 }
 
+
 /*
  * 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