* src/vm/global.h: Made 'lockword' member of java_object_t a plain

[cacao.git] / src / vm / global.h

diff --git a/src/vm/global.h b/src/vm/global.h
index 420352c6a1c0636e16b8771cad188b4c634a38d4..e761d76eb3a0af8d705ee15dad35f10247856d93 100644 (file)
--- a/src/vm/global.h
+++ b/src/vm/global.h
@@ -1,6 +1,6 @@
 /* src/vm/global.h - global definitions
 
-   Copyright (C) 1996-2005, 2006, 2007, 2008
+   Copyright (C) 1996-2005, 2006, 2007, 2008, 2010
    CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
@@ -77,8 +77,10 @@ typedef union {
 /* Define printf formats which change size between 32- and 64-bit. */
 
 #if SIZEOF_VOID_P == 8
+# define PRINTF_FORMAT_INTPTR_T   "0x%016lx"
 # define PRINTF_FORMAT_INT64_T    "%ld"
 #else
+# define PRINTF_FORMAT_INTPTR_T   "0x%08lx"
 # define PRINTF_FORMAT_INT64_T    "%lld"
 #endif
 
@@ -95,6 +97,10 @@ typedef union {
 # define MIN(a,b)  (((a) < (b)) ? (a) : (b))
 #endif
 
+#ifndef MAX
+# define MAX(a,b)  (((a) > (b)) ? (a) : (b))
+#endif
+
 
 /* forward typedefs ***********************************************************/
 
@@ -241,7 +247,7 @@ typedef struct java_objectarray_t java_objectarray_t;
 struct java_object_t {                 /* header for all objects              */
        struct _vftbl *vftbl;              /* pointer to virtual function table   */
 #if defined(ENABLE_THREADS)
-       Lockword       lockword;
+       uintptr_t      lockword;
 #endif
 #if defined(ENABLE_GC_CACAO)
        uintptr_t      hdrflags;           /* word containing the GC bits         */