GNU header update.

[cacao.git] / src / native / vm / VMThread.c

diff --git a/src/native/vm/VMThread.c b/src/native/vm/VMThread.c
index 07ff6c2858c610576575e185aece00c495108929..dd179e82dc479d89caadc50da153297d49b0bcb2 100644 (file)
--- a/src/native/vm/VMThread.c
+++ b/src/native/vm/VMThread.c
@@ -1,9 +1,9 @@
-/* nat/Thread.c - java/lang/Thread
+/* native/vm/VMThread.c - java/lang/VMThread
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
-   M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
-   P. Tomsich, J. Wenninger
+   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
+   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
+   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
+   Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -28,26 +28,34 @@
 
    Changes: Joseph Wenninger
 
-   $Id: VMThread.c 1389 2004-08-02 21:51:33Z stefan $
+   $Id: VMThread.c 1735 2004-12-07 14:33:27Z twisti $
 
 */
 
 
-#include "jni.h"
-#include "builtin.h"
-#include "exceptions.h"
+#include "config.h"
 #include "types.h"
-#include "native.h"
-#include "loader.h"
-#include "options.h"
-#include "tables.h"
-#include "threads/thread.h"
+#include "native/jni.h"
+#include "native/native.h"
+#include "native/include/java_lang_ThreadGroup.h"
+#include "native/include/java_lang_Object.h"            /* java_lang_Thread.h */
+#include "native/include/java_lang_Throwable.h"         /* java_lang_Thread.h */
+#include "native/include/java_lang_VMThread.h"
+#include "native/include/java_lang_Thread.h"
+
+#if defined(USE_THREADS)
+# if defined(NATIVE_THREADS)
+#  include "threads/native/threads.h"
+# else
+#  include "threads/green/threads.h"
+# endif
+#endif
+
 #include "toolbox/logging.h"
-#include "java_lang_ThreadGroup.h"
-#include "java_lang_Object.h"         /* needed for java_lang_Thread.h */
-#include "java_lang_Throwable.h"      /* needed for java_lang_Thread.h */
-#include "java_lang_VMThread.h"
-#include "java_lang_Thread.h"
+#include "vm/builtin.h"
+#include "vm/exceptions.h"
+#include "vm/options.h"
+#include "vm/tables.h"
 
 
 /*
@@ -129,9 +137,13 @@ JNIEXPORT s4 JNICALL Java_java_lang_VMThread_isAlive(JNIEnv *env, java_lang_VMTh
        return aliveThread((thread *) this->thread);
 #else
        /* This method is implemented in classpath. */
-       panic("aliveThread");
+       throw_cacao_exception_exit(string_java_lang_InternalError, "aliveThread");
 #endif
 #endif
+
+       /* keep compiler happy */
+
+       return 0;
 }
 
 
@@ -317,15 +329,17 @@ JNIEXPORT void JNICALL Java_java_lang_VMThread_nativeInit(JNIEnv *env, java_lang
 #endif
 }
 
+
 /*
  * Class:     java/lang/VMThread
  * Method:    holdsLock
  * Signature: (Ljava/lang/Object;)Z
  */
-JNIEXPORT s4 JNICALL Java_java_lang_VMThread_holdsLock(JNIEnv *env, jclass clazz, struct java_lang_Object* o)
+JNIEXPORT s4 JNICALL Java_java_lang_VMThread_holdsLock(JNIEnv *env, jclass clazz, java_lang_Object* o)
 {
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       return threadHoldsLock((threadobject*) THREADOBJECT, o);
+       return threadHoldsLock((threadobject*) THREADOBJECT,
+                                                  (java_objectheader *) o);
 #else
        /* I don't know how to find out [stefan] */
        return 0;
@@ -333,7 +347,6 @@ JNIEXPORT s4 JNICALL Java_java_lang_VMThread_holdsLock(JNIEnv *env, jclass clazz
 }
 
 
-
 /*
  * 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