make isl_obj_none a constant expression

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>

diff --git a/include/isl_obj.h b/include/isl_obj.h
index 6d1af23..49645cf 100644 (file)
--- a/include/isl_obj.h
+++ b/include/isl_obj.h
@@ -17,7 +17,8 @@ struct isl_obj_vtable {
        void (*free)(void *v);
 };
 typedef struct isl_obj_vtable *isl_obj_type;
-extern isl_obj_type isl_obj_none;
+extern struct isl_obj_vtable isl_obj_none_vtable;
+#define isl_obj_none           (&isl_obj_none_vtable)
 extern struct isl_obj_vtable isl_obj_set_vtable;
 #define isl_obj_set            (&isl_obj_set_vtable)
 extern struct isl_obj_vtable isl_obj_map_vtable;

diff --git a/isl_obj.c b/isl_obj.c
index 47341a0..74b7fab 100644 (file)
--- a/isl_obj.c
+++ b/isl_obj.c
@@ -86,13 +86,12 @@ static void *isl_obj_none_add(void *v1, void *v2)
        return NULL;
 }
 
-static struct isl_obj_vtable obj_none = {
+struct isl_obj_vtable isl_obj_none_vtable = {
        isl_obj_none_copy,
        isl_obj_none_add,
        isl_obj_none_print,
        isl_obj_none_free
 };
-isl_obj_type isl_obj_none = &obj_none;
 
 static void *isl_obj_pw_qp_copy(void *v)
 {