* Removed all Id tags.

[cacao.git] / src / vm / jit / show.c

diff --git a/src/vm/jit/show.c b/src/vm/jit/show.c
index 449288e4f10e398334eaff39fc945ff01e32c3d5..4031b6b706ebce9ef1ba576aa42a88db9fef7ff3 100644 (file)
--- a/src/vm/jit/show.c
+++ b/src/vm/jit/show.c
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id$
-
 */
 
 
@@ -40,6 +38,7 @@
 #include "vm/global.h"
 #include "vm/builtin.h"
 #include "vm/stringlocal.h"
+#include "vm/vm.h"
 
 #include "vm/jit/abi.h"
 #include "vm/jit/jit.h"
@@ -63,7 +62,7 @@
 /* global variables ***********************************************************/
 
 #if defined(ENABLE_THREADS) && !defined(NDEBUG)
-static java_objectheader *show_global_lock;
+static java_object_t *show_global_lock;
 #endif
 
 
@@ -86,7 +85,7 @@ bool show_init(void)
 #if defined(ENABLE_THREADS)
        /* initialize the show lock */
 
-       show_global_lock = NEW(java_objectheader);
+       show_global_lock = NEW(java_object_t);
 
        LOCK_INIT_OBJECT_LOCK(show_global_lock);
 #endif
@@ -695,7 +694,7 @@ void show_basicblock(jitdata *jd, basicblock *bptr, int stage)
         if (stage >= SHOW_PARSE) {                                   \
             putchar('"');                                            \
             utf_display_printable_ascii(                             \
-               javastring_toutf((java_objectheader *)(val), false)); \
+               javastring_toutf((java_handle_t *)(val), false));     \
             printf("\" ");                                           \
         }                                                            \
         else {                                                       \
@@ -1449,7 +1448,7 @@ void show_icmd(jitdata *jd, instruction *iptr, bool deadcode, int stage)
 #if defined(ENABLE_DEBUG_FILTER)
 
 #if !defined(ENABLE_THREADS)
-u4 _no_threads_filterverbosecallctr[2] = { 0, 0 };
+u2 _no_threads_filterverbosecallctr[2] = { 0, 0 };
 #endif
 
 struct show_filter {