X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fstring.c;h=1d127f76f57c0248bdaf7d18043a187bc915e6ac;hb=bfb7d15b502b8170ec8a9b348c546418c0e44ace;hp=a9b1d1a334d08f90a7864eb2a02aacb565f594d3;hpb=2457ad8bcdb80a1026380a158052aa91ad06651d;p=cacao.git diff --git a/src/vm/string.c b/src/vm/string.c index a9b1d1a33..1d127f76f 100644 --- a/src/vm/string.c +++ b/src/vm/string.c @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - $Id: string.c 7522 2007-03-14 21:54:49Z twisti $ + $Id: string.c 7813 2007-04-25 19:20:13Z twisti $ */ @@ -41,11 +41,7 @@ #include "native/include/java_lang_String.h" -#if defined(ENABLE_THREADS) -# include "threads/native/lock.h" -#else -# include "threads/none/lock.h" -#endif +#include "threads/lock-common.h" #include "vm/builtin.h" #include "vm/exceptions.h" @@ -86,7 +82,7 @@ bool string_init(void) lock_hashtable_string = NEW(java_objectheader); - lock_init_object_lock(lock_hashtable_string); + LOCK_INIT_OBJECT_LOCK(lock_hashtable_string); #endif /* everything's ok */