* ICMD_CHECKASIZE, ICMD_CHECKEXCEPTION: Removed.

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

diff --git a/src/vm/global.h b/src/vm/global.h
index 1ed8d88034f4786e25107d619c953cb670db1898..a54b1682dc72ad8f6a393e3da986674aabcc36c2 100644 (file)
--- a/src/vm/global.h
+++ b/src/vm/global.h
@@ -33,7 +33,7 @@
             Joseph Wenninger
             Christian Thalinger
 
-   $Id: global.h 2591 2005-06-08 11:03:00Z twisti $
+   $Id: global.h 3313 2005-09-29 14:31:21Z twisti $
 
 */
 
@@ -76,18 +76,16 @@ typedef struct java_objectheader java_objectheader;
 typedef struct java_objectarray java_objectarray;
 
 
-/* define some cacao paths ****************************************************/
+/* some Java related defines **************************************************/
 
-#define CACAO_JRE_DIR               "/jre"
-#define CACAO_LIBRARY_PATH          "/jre/lib/"ARCH_DIR"/"
-#define CACAO_RT_JAR_PATH           "/jre/lib/rt.jar"
-#define CACAO_EXT_DIR               "/jre/lib/ext"
+#define JAVA_VERSION    "1.4.2"         /* this version is supported by CACAO */
 
-#if defined(WITH_EXTERNAL_CLASSPATH)
-#define CACAO_VM_ZIP_PATH           "/jre/lib/vm.zip"
+
+/* define some CACAO paths ****************************************************/
+
+#define CACAO_VM_ZIP_PATH           "/share/cacao/vm.zip"
 #define CLASSPATH_LIBRARY_PATH      "/lib/classpath"
 #define CLASSPATH_GLIBJ_ZIP_PATH    "/share/classpath/glibj.zip"
-#endif
 
 
 /*