Merged revisions 7797-7917 via svnmerge from

[cacao.git] / src / vm / initialize.c

diff --git a/src/vm/initialize.c b/src/vm/initialize.c
index 366f85f9df446c2c39f0458929f932f7821ca1cf..9619b9656701d99276405cf37b745e1b9e7b759e 100644 (file)
--- a/src/vm/initialize.c
+++ b/src/vm/initialize.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: initialize.c 7246 2007-01-29 18:49:05Z twisti $
+   $Id: initialize.c 7813 2007-04-25 19:20:13Z twisti $
 
 */
 
@@ -33,11 +33,7 @@
 
 #include "vm/types.h"
 
-#if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
-#else
-# include "threads/none/lock.h"
-#endif
+#include "threads/lock-common.h"
 
 #include "vm/global.h"
 #include "vm/initialize.h"