Merged revisions 7797-7917 via svnmerge from

[cacao.git] / src / vm / jit / x86_64 / emit.c

diff --git a/src/vm/jit/x86_64/emit.c b/src/vm/jit/x86_64/emit.c
index a7d9f0017ebefa76fe7a1947b143d4e4657acb68..f7bfc5f9006f7b447884c5cb14c412f27d482a4a 100644 (file)
--- a/src/vm/jit/x86_64/emit.c
+++ b/src/vm/jit/x86_64/emit.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: emit.c 7766 2007-04-19 13:24:48Z michi $
+   $Id: emit.c 7813 2007-04-25 19:20:13Z twisti $
 
 */
 
@@ -39,9 +39,7 @@
 
 #include "mm/memory.h"
 
-#if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
-#endif
+#include "threads/lock-common.h"
 
 #include "vm/builtin.h"
 #include "vm/exceptions.h"