* Removed all Id tags.

[cacao.git] / src / toolbox / hashtable.c

diff --git a/src/toolbox/hashtable.c b/src/toolbox/hashtable.c
index d6d7bf1851826ec7611f9802a0381840e790b179..f502fca4d8e48ad819c84b06e5ee6a1fcc9a27be 100644 (file)
--- a/src/toolbox/hashtable.c
+++ b/src/toolbox/hashtable.c
@@ -1,4 +1,4 @@
-/* src/vm/hashtable.c - functions for internal hashtables
+/* src/toolbox/hashtable.c - functions for internal hashtables
 
    Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
    C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
@@ -22,15 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Reinhard Grafl
-            Mark Probst
-            Andreas Krall
-            Christian Thalinger
-
-   $Id: hashtable.c 7246 2007-01-29 18:49:05Z twisti $
-
 */
 
 
@@ -39,11 +30,10 @@
 
 #include "mm/memory.h"
 
-#if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
-#endif
+#include "threads/lock-common.h"
 
 #include "toolbox/hashtable.h"
+
 #include "vm/global.h"
 
 
@@ -59,13 +49,13 @@ void hashtable_create(hashtable *hash, u4 size)
        /* initialize locking pointer */
 
 #if defined(ENABLE_THREADS)
-       /* We need to seperately allocate a java_objectheader here, as we
+       /* We need to seperately allocate a java_object_t here, as we
           need to store the lock object in the new hashtable if it's
           resized.  Otherwise we get an IllegalMonitorStateException. */
 
-       hash->header = NEW(java_objectheader);
+       hash->header = NEW(java_object_t);
 
-       lock_init_object_lock(hash->header);
+       LOCK_INIT_OBJECT_LOCK(hash->header);
 #endif
 
        /* set initial hash values */
@@ -99,7 +89,7 @@ hashtable *hashtable_resize(hashtable *hash, u4 size)
        /* We need to store the old lock object in the new hashtable.
           Otherwise we get an IllegalMonitorStateException. */
 
-       FREE(newhash->header, java_objectheader);
+       FREE(newhash->header, java_object_t);
 
        newhash->header  = hash->header;
 #endif