* src/vm/builtin.c: Moved to .cpp.

[cacao.git] / src / threads / lock-common.h

diff --git a/src/threads/lock-common.h b/src/threads/lock-common.h
index 433c16db8f631e2434c9d1f2d95adf8538fa50de..e0a8f674b7622ca695a83c223b136d3d39207528 100644 (file)
--- a/src/threads/lock-common.h
+++ b/src/threads/lock-common.h
@@ -1,9 +1,7 @@
 /* src/threads/lock-common.h - common stuff of lock implementation
 
-   Copyright (C) 2007 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
+   Copyright (C) 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,8 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: threads.h 4866 2006-05-01 21:40:38Z edwin $
-
 */
 
 
@@ -31,40 +27,51 @@
 #define _LOCK_COMMON_H
 
 #include "config.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "vm/types.h"
 
 #include "vm/global.h"
 
 #if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
+# include "threads/posix/lock.h"
 #else
 # include "threads/none/lock.h"
 #endif
 
 
+/* only define the following stuff with thread enabled ************************/
+
+#if defined(ENABLE_THREADS)
+
 /* functions ******************************************************************/
 
 void lock_init(void);
 
-void lock_init_execution_env(struct threadobject *thread);
-void lock_record_free_pools(lock_record_pool_t *pool);
-
-void lock_init_object_lock(java_objectheader *);
-lock_record_t *lock_get_initial_lock_word(void);
+void lock_init_object_lock(java_object_t *);
 
 ptrint lock_pre_compute_thinlock(s4 index);
 
-bool lock_monitor_enter(java_objectheader *);
-bool lock_monitor_exit(java_objectheader *);
+bool lock_monitor_enter(java_handle_t *);
+bool lock_monitor_exit(java_handle_t *);
 
 #define LOCK_monitor_enter    (functionptr) lock_monitor_enter
 #define LOCK_monitor_exit     (functionptr) lock_monitor_exit
 
-bool lock_is_held_by_current_thread(java_objectheader *o);
+bool lock_is_held_by_current_thread(java_handle_t *o);
+
+void lock_wait_for_object(java_handle_t *o, s8 millis, s4 nanos);
+void lock_notify_object(java_handle_t *o);
+void lock_notify_all_object(java_handle_t *o);
 
-void lock_wait_for_object(java_objectheader *o, s8 millis, s4 nanos);
-void lock_notify_object(java_objectheader *o);
-void lock_notify_all_object(java_objectheader *o);
+#endif /* ENABLE_THREADS */
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _LOCK_COMMON_H */