move java-specific declarations out of common.h

src/bootimage.h

@@ -12,6 +12,7 @@
 #define BOOTIMAGE_H
 
 #include "common.h"
+#include "java-common.h"
 #include "target.h"
 #include "machine.h"
 

src/common.h

@@ -535,57 +535,6 @@ equal(const void* a, unsigned al, const void* b, unsigned bl)
   }
 }
 
-class Machine;
-class Thread;
-
-struct Object { };
-
-typedef Object* object;
-
-typedef uint8_t jboolean;
-typedef int8_t jbyte;
-typedef uint16_t jchar;
-typedef int16_t jshort;
-typedef int32_t jint;
-typedef int64_t jlong;
-typedef float jfloat;
-typedef double jdouble;
-
-typedef jint jsize;
-
-typedef object* jobject;
-
-typedef jobject jclass;
-typedef jobject jthrowable;
-typedef jobject jstring;
-typedef jobject jweak;
-
-typedef jobject jarray;
-typedef jarray jbooleanArray;
-typedef jarray jbyteArray;
-typedef jarray jcharArray;
-typedef jarray jshortArray;
-typedef jarray jintArray;
-typedef jarray jlongArray;
-typedef jarray jfloatArray;
-typedef jarray jdoubleArray;
-typedef jarray jobjectArray;
-
-typedef uintptr_t jfieldID;
-typedef uintptr_t jmethodID;
-
-union jvalue {
-  jboolean z;
-  jbyte    b;
-  jchar    c;
-  jshort   s;
-  jint     i;
-  jlong    j;
-  jfloat   f;
-  jdouble  d;
-  jobject  l;
-};
-
 } // namespace vm
 
-#endif//COMMON_H
+#endif // COMMON_H

src/heapwalk.h

@@ -12,6 +12,7 @@
 #define HEAPWALK_H
 
 #include "common.h"
+#include "java-common.h"
 
 namespace vm {
 

src/java-common.h

@@ -0,0 +1,69 @@
+/* Copyright (c) 2008-2012, Avian Contributors
+
+   Permission to use, copy, modify, and/or distribute this software
+   for any purpose with or without fee is hereby granted, provided
+   that the above copyright notice and this permission notice appear
+   in all copies.
+
+   There is NO WARRANTY for this software.  See license.txt for
+   details. */
+
+#ifndef JAVA_COMMON_H
+#define JAVA_COMMON_H
+
+namespace vm {
+
+class Machine;
+class Thread;
+
+struct Object { };
+
+typedef Object* object;
+
+typedef uint8_t jboolean;
+typedef int8_t jbyte;
+typedef uint16_t jchar;
+typedef int16_t jshort;
+typedef int32_t jint;
+typedef int64_t jlong;
+typedef float jfloat;
+typedef double jdouble;
+
+typedef jint jsize;
+
+typedef object* jobject;
+
+typedef jobject jclass;
+typedef jobject jthrowable;
+typedef jobject jstring;
+typedef jobject jweak;
+
+typedef jobject jarray;
+typedef jarray jbooleanArray;
+typedef jarray jbyteArray;
+typedef jarray jcharArray;
+typedef jarray jshortArray;
+typedef jarray jintArray;
+typedef jarray jlongArray;
+typedef jarray jfloatArray;
+typedef jarray jdoubleArray;
+typedef jarray jobjectArray;
+
+typedef uintptr_t jfieldID;
+typedef uintptr_t jmethodID;
+
+union jvalue {
+  jboolean z;
+  jbyte    b;
+  jchar    c;
+  jshort   s;
+  jint     i;
+  jlong    j;
+  jfloat   f;
+  jdouble  d;
+  jobject  l;
+};
+
+} // namespace vm
+
+#endif // JAVA_COMMON_H

src/machine.h

@@ -12,6 +12,7 @@
 #define MACHINE_H
 
 #include "common.h"
+#include "java-common.h"
 #include <avian/vm/system/system.h>
 #include <avian/vm/heap/heap.h>
 #include "finder.h"