X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Ftoolbox%2Fhashtable.h;h=65b166e41defb5fcdec43d9b46ae216975b756f9;hb=b307ed446ce8893052cd4774fcb2298cf4d7a4db;hp=056dbc1c073eda847810a33c793d247f531ba2e3;hpb=d362a578296d95d99d4c996a12d116ecbb809866;p=cacao.git

diff --git a/src/toolbox/hashtable.h b/src/toolbox/hashtable.h
index 056dbc1c0..65b166e41 100644
--- a/src/toolbox/hashtable.h
+++ b/src/toolbox/hashtable.h
@@ -1,9 +1,7 @@
 /* src/toolbox/hashtable.h - functions for internal hashtables
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,13 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Reinhard Grafl
-            Christian Thalinger
-
-   $Id: hashtable.h 7246 2007-01-29 18:49:05Z twisti $
-
 */
 
 
@@ -43,8 +34,10 @@ typedef struct hashtable hashtable;
 #include "config.h"
 #include "vm/types.h"
 
+#include "threads/mutex.hpp"
+
 #include "vm/global.h"
-#include "vmcore/utf8.h"
+#include "vm/utf8.h"
 
 
 /* data structures for hashtables ********************************************
@@ -102,7 +95,7 @@ hashtable.ptr-->+-------------------+
 
 struct hashtable {            
 #if defined(ENABLE_THREADS)
-	java_objectheader  *header;         /* required for locking               */
+	Mutex              *mutex;          /* required for locking               */
 #endif
 	u4                  size;           /* current size of the hashtable      */
 	u4                  entries;        /* number of entries in the table     */
@@ -112,6 +105,10 @@ struct hashtable {
 
 /* function prototypes ********************************************************/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* create hashtable */
 void hashtable_create(hashtable *hash, u4 size);
 
@@ -121,6 +118,10 @@ hashtable *hashtable_resize(hashtable *hash, u4 size);
 /* frees a hashtable */
 void hashtable_free(hashtable *hash);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _HASHTABLE_H */