Merged revisions 7797-7917 via svnmerge from

[cacao.git] / src / vmcore / utf8.c

diff --git a/src/vmcore/utf8.c b/src/vmcore/utf8.c
index 3251e5924cf80de20bb7acf014205ec124f1b3e3..65a4126568349fa2784c11d278f46815c4aef54c 100644 (file)
--- a/src/vmcore/utf8.c
+++ b/src/vmcore/utf8.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: utf8.c 7716 2007-04-16 14:29:53Z twisti $
+   $Id: utf8.c 7813 2007-04-25 19:20:13Z twisti $
 
 */
 
@@ -36,11 +36,7 @@
 
 #include "mm/memory.h"
 
-#if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
-#else
-# include "threads/none/lock.h"
-#endif
+#include "threads/lock-common.h"
 
 #include "toolbox/hashtable.h"