Merged revisions 7797-7917 via svnmerge from

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

diff --git a/src/native/vm/java_lang_Object.c b/src/native/vm/java_lang_Object.c
index 83f5f7570552969bb057467804e64f31284d9fe6..adadd0d0be95e9de84fa6abe5b779cc40170a863 100644 (file)
--- a/src/native/vm/java_lang_Object.c
+++ b/src/native/vm/java_lang_Object.c
@@ -47,9 +47,7 @@
 
 #include "native/include/java_lang_Object.h"
 
-#if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
-#endif
+#include "threads/lock-common.h"
 
 #include "vm/builtin.h"