Merged revisions 8299-8320 via svnmerge from

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

diff --git a/src/vm/initialize.c b/src/vm/initialize.c
index 366f85f9df446c2c39f0458929f932f7821ca1cf..e7b9df43686b1d1aff0767ed4c9b62835d0b5d54 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 8295 2007-08-11 17:57:24Z michi $
 
 */
 
@@ -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"
@@ -134,8 +130,8 @@ bool initialize_class(classinfo *c)
 
 static bool initialize_class_intern(classinfo *c)
 {
-       methodinfo        *m;
-       java_objectheader *xptr;
+       methodinfo    *m;
+       java_handle_t *xptr;
 
        /* maybe the class is not already linked */