* src/threads/threadlist.c: Moved to .cpp.

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

diff --git a/src/vm/assertion.h b/src/vm/assertion.h
index 20add69ccf0700ed89c85f7855e277c6389155e2..b677906a912057faa6af27e5855b283429d1c341 100644 (file)
--- a/src/vm/assertion.h
+++ b/src/vm/assertion.h
@@ -30,12 +30,7 @@
 
 #include <stdint.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "vm/global.h"
-#include "toolbox/list.h"
+#include "toolbox/list.hpp"
 
 
 typedef struct assertion_name_t assertion_name_t;
@@ -44,19 +39,28 @@ struct assertion_name_t {
        char      *name;
        bool       enabled;
        bool       package;
-       listnode_t linkage;
+/*     listnode_t linkage; */
 };
 
 /* -ea/-esa/-da/-dsa options **************************************************/
 
-extern list_t  *list_assertion_names;
-extern int32_t  assertion_class_count;
-extern int32_t  assertion_package_count;
-extern bool     assertion_user_enabled;
-extern bool     assertion_system_enabled;
+#ifdef __cplusplus
+extern List<assertion_name_t*>*   list_assertion_names;
+#else
+extern List*   list_assertion_names;
+#endif
+
+extern int32_t assertion_class_count;
+extern int32_t assertion_package_count;
+extern bool    assertion_user_enabled;
+extern bool    assertion_system_enabled;
 
 /* function prototypes ********************************************************/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void assertion_ea_da(const char *name, bool enabled);
 
 #ifdef __cplusplus