Merged trunk and subtype.

[cacao.git] / src / threads / posix / lock.h

diff --git a/src/threads/posix/lock.h b/src/threads/posix/lock.h
index ddadd3f81a7e20ae314aef62fbe02a8500ee2dfd..263459ddc65c25aa79f9fa8feefdfd2cfdd88ddf 100644 (file)
--- a/src/threads/posix/lock.h
+++ b/src/threads/posix/lock.h
@@ -28,10 +28,6 @@
 
 #include "config.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <pthread.h>
 
 #include "vm/types.h"
@@ -45,6 +41,9 @@ extern "C" {
 #include "vm/global.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* typedefs *******************************************************************/
 
@@ -102,9 +101,6 @@ struct lock_hashtable_t {
 #define LOCK_MONITOR_ENTER(o)    lock_monitor_enter((java_handle_t *) LLNI_QUICKWRAP(o))
 #define LOCK_MONITOR_EXIT(o)     lock_monitor_exit((java_handle_t *) LLNI_QUICKWRAP(o))
 
-#define LOCK_WAIT_FOREVER(o)     lock_wait_for_object((java_handle_t *) LLNI_QUICKWRAP(o), 0, 0)
-#define LOCK_NOTIFY(o)           lock_notify_object((java_handle_t *) LLNI_QUICKWRAP(o))
-
 #ifdef __cplusplus
 }
 #endif