Merged revisions 7797-7917 via svnmerge from

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

diff --git a/src/vm/jit/alpha/emit.c b/src/vm/jit/alpha/emit.c
index 38865c1232a9c8453b6753f30a5a16d41b875a1e..ee50adde72b66bca4fe55ff200bb3f3b74a27ca5 100644 (file)
--- a/src/vm/jit/alpha/emit.c
+++ b/src/vm/jit/alpha/emit.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: emit.c 4398 2006-01-31 23:43:08Z twisti $
+   $Id: emit.c 7918 2007-05-20 20:42:18Z michi $
 
 */
 
@@ -38,9 +38,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"