Fixed --disable-threads compiling issues (missing header includes).

diff --git a/src/cacaoh/headers.h b/src/cacaoh/headers.h
index 648ea801bcb869f1d4d569e6f453e4cd4ffeab39..43f23ce2b61665244e0cf7c34644a28af047b67f 100644 (file)
--- a/src/cacaoh/headers.h
+++ b/src/cacaoh/headers.h
@@ -26,14 +26,13 @@
 
    Authors: Christian Thalinger
 
-   $Id: headers.h 2002 2005-03-05 17:10:18Z twisti $
+   $Id: headers.h 2194 2005-04-03 16:13:27Z twisti $
 
 */
 
 #ifndef _HEADERS_H
 #define _HEADERS_H
 
-
 #if defined(USE_THREADS)
 # if defined(NATIVE_THREADS)
 #  include "threads/native/threads.h"
@@ -44,7 +43,10 @@
 #endif
 
 #include "toolbox/chain.h"
+#include "vm/class.h"
 #include "vm/global.h"
+#include "vm/method.h"
+#include "vm/utf8.h"
 
 
 /* export variables ***********************************************************/

diff --git a/src/native/jni.c b/src/native/jni.c
index 982245d626838573eaf2fe7bd8a4312b6ef75c21..a4b995b80bebeb1a917fdae64d0b3a58a65a4fbc 100644 (file)
--- a/src/native/jni.c
+++ b/src/native/jni.c
@@ -31,7 +31,7 @@
             Martin Platter
             Christian Thalinger
 
-   $Id: jni.c 2193 2005-04-02 19:33:43Z edwin $
+   $Id: jni.c 2194 2005-04-03 16:13:27Z twisti $
 
 */
 
@@ -43,6 +43,7 @@
 #include "mm/memory.h"
 #include "native/jni.h"
 #include "native/native.h"
+#include "native/include/java_lang_Object.h"
 #include "native/include/java_lang_Byte.h"
 #include "native/include/java_lang_Character.h"
 #include "native/include/java_lang_Short.h"

diff --git a/src/toolbox/util.c b/src/toolbox/util.c
index 9cf650a8595d0ebc2071d3d2673257dd5e9007d5..fec3b2cfd666532c9d068cb916339ebd44f04c33 100644 (file)
--- a/src/toolbox/util.c
+++ b/src/toolbox/util.c
@@ -28,12 +28,13 @@
 
    Changes:
 
-   $Id: util.c 2127 2005-03-29 22:24:34Z twisti $
+   $Id: util.c 2194 2005-04-03 16:13:27Z twisti $
 
 */
 
 
 #include <errno.h>
+#include <stdarg.h>
 #include <unistd.h>
 
 #include "types.h"

diff --git a/src/vm/descriptor.c b/src/vm/descriptor.c
index c68d1ac351c010e3d3c84dfa433f25cdd7f92ac8..7301e090ead74fffe574306cad176d3dcae0cec0 100644 (file)
--- a/src/vm/descriptor.c
+++ b/src/vm/descriptor.c
@@ -1,4 +1,4 @@
-/* vm/descriptor.c - checking and parsing of field / method descriptors
+/* src/vm/descriptor.c - checking and parsing of field / method descriptors
 
    Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
    R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
@@ -28,12 +28,14 @@
 
    Changes:
 
-   $Id: descriptor.c 2186 2005-04-02 00:43:25Z edwin $
+   $Id: descriptor.c 2194 2005-04-03 16:13:27Z twisti $
 
 */
 
 #include <assert.h>
 
+#include "types.h"
+#include "mm/memory.h"
 #include "vm/descriptor.h"
 #include "vm/exceptions.h"
 #include "vm/resolve.h"

diff --git a/src/vm/jit/asmpart.h b/src/vm/jit/asmpart.h
index e4d19645e0f25b1d9fc89f51523d72a59bf7b980..5f472c8e6a5544355d86efca570a7f8609da4228 100644 (file)
--- a/src/vm/jit/asmpart.h
+++ b/src/vm/jit/asmpart.h
@@ -1,4 +1,4 @@
-/* vm/jit/asmpart.h - prototypes for machine specfic functions
+/* src/vm/jit/asmpart.h - prototypes for machine specfic functions
 
    Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
    R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
@@ -29,7 +29,7 @@
 
    Changes: Christian Thalinger
 
-   $Id: asmpart.h 2141 2005-03-30 12:51:58Z twisti $
+   $Id: asmpart.h 2194 2005-04-03 16:13:27Z twisti $
 
 */
 
@@ -121,11 +121,8 @@ void asm_throw_and_handle_arrayindexoutofbounds_exception();
 #endif
 void asm_throw_and_handle_hardware_arithmetic_exception();
 
-java_objectarray* Java_java_lang_VMSecurityManager_getClassContext(JNIEnv *env, jclass clazz);
 stacktraceelement *asm_get_stackTrace();
 
-/*java_lang_ClassLoader* Java_java_lang_VMSecurityManager_currentClassLoader(JNIEnv *env, jclass clazz);*/
-
 void *asm_switchstackandcall(void *stack, void *func, void **stacktopsave, void * p);
 
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)

diff --git a/src/vm/resolve.c b/src/vm/resolve.c
index 55b291f439cd7ba8f26cb74db854aa1aa645068d..f5f2b8b6205d6d132990bf8d33b9212735894b82 100644 (file)
--- a/src/vm/resolve.c
+++ b/src/vm/resolve.c
@@ -28,12 +28,14 @@
 
    Changes:
 
-   $Id: resolve.c 2193 2005-04-02 19:33:43Z edwin $
+   $Id: resolve.c 2194 2005-04-03 16:13:27Z twisti $
 
 */
 
+
 #include <assert.h>
 
+#include "mm/memory.h"
 #include "vm/resolve.h"
 #include "vm/access.h"
 #include "vm/classcache.h"
@@ -45,6 +47,7 @@
 #include "vm/jit/jit.h"
 #include "vm/jit/verify/typeinfo.h"
 
+
 /******************************************************************************/
 /* DEBUG HELPERS                                                              */
 /******************************************************************************/