* tests/regression/bugzilla/PR119.java: Added new regression test.

[cacao.git] / src / vm / suck.hpp

diff --git a/src/vm/suck.hpp b/src/vm/suck.hpp
index de9317ec01b0702453ea994201e8bc573ade8fe1..20e2580518a807ef4d7e069805237284dc192943 100644 (file)
--- a/src/vm/suck.hpp
+++ b/src/vm/suck.hpp
@@ -33,9 +33,9 @@
 #include "threads/mutex.hpp"
 
 #include "toolbox/hashtable.h"
-#include "toolbox/list.h"
+#include "toolbox/list.hpp"
 
-#include "vm/class.h"
+#include "vm/class.hpp"
 #include "vm/global.h"
 #include "vm/loader.hpp"
 
@@ -59,7 +59,6 @@ struct list_classpath_entry {
 #if defined(ENABLE_ZLIB)
        hashtable         *htclasses;
 #endif
-       listnode_t         linkage;
 };
 
 
@@ -79,10 +78,7 @@ struct list_classpath_entry {
 #define SUCK_LE_U1(p)    *((u1 *) (p))
 #define SUCK_LE_U2(p)    *((u2 *) (p))
 #define SUCK_LE_U4(p)    *((u4 *) (p))
-
-#if U8_AVAILABLE == 1
 #define SUCK_LE_U8(p)    *((u8 *) (p))
-#endif
 
 #else /* defined(__I386__) || defined(__X86_64__) */
 
@@ -99,7 +95,6 @@ struct list_classpath_entry {
      (((u4) (p)[1]) << 8) + \
       ((u4) (p)[0]))
 
-#if U8_AVAILABLE == 1
 #define SUCK_LE_U8(p) \
     ((((u8) (p)[7]) << 56) + \
      (((u8) (p)[6]) << 48) + \
@@ -109,7 +104,6 @@ struct list_classpath_entry {
      (((u8) (p)[2]) << 16) + \
      (((u8) (p)[1]) << 8) + \
       ((u8) (p)[0]))
-#endif
 
 #endif /* defined(__I386__) || defined(__X86_64__) */
 
@@ -129,7 +123,6 @@ struct list_classpath_entry {
      (((u4) (p)[2]) << 8) + \
       ((u4) (p)[3]))
 
-#if U8_AVAILABLE == 1
 #define SUCK_BE_U8(p) \
     ((((u8) (p)[0]) << 56) + \
      (((u8) (p)[1]) << 48) + \
@@ -139,7 +132,6 @@ struct list_classpath_entry {
      (((u8) (p)[5]) << 16) + \
      (((u8) (p)[6]) << 8) + \
       ((u8) (p)[7]))
-#endif
 
 
 #define SUCK_BE_S1(p)    (s1) SUCK_BE_U1(p)
@@ -158,8 +150,11 @@ struct list_classpath_entry {
 
 /* export variables ***********************************************************/
 
-extern list_t *list_classpath_entries;
-
+#ifdef __cplusplus
+extern List<list_classpath_entry*>* list_classpath_entries;
+#else
+extern List* list_classpath_entries;
+#endif
 
 /* function prototypes ********************************************************/