declare isl_multi_* together with isl_*

This will make it easier to add new isl_multi_* types.

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

diff --git a/include/isl/aff.h b/include/isl/aff.h
index 1acb28e..225c786 100644 (file)
--- a/include/isl/aff.h
+++ b/include/isl/aff.h
@@ -271,6 +271,8 @@ __isl_give isl_set *isl_pw_aff_list_ge_set(__isl_take isl_pw_aff_list *list1,
 __isl_give isl_set *isl_pw_aff_list_gt_set(__isl_take isl_pw_aff_list *list1,
        __isl_take isl_pw_aff_list *list2);
 
+ISL_DECLARE_MULTI(aff)
+
 __isl_give isl_multi_aff *isl_multi_aff_from_aff(__isl_take isl_aff *aff);
 __isl_give isl_multi_aff *isl_multi_aff_zero(__isl_take isl_space *space);
 __isl_give isl_multi_aff *isl_multi_aff_identity(__isl_take isl_space *space);
@@ -358,6 +360,8 @@ __isl_give isl_multi_aff *isl_multi_aff_read_from_str(isl_ctx *ctx,
                const char *str);
 void isl_multi_aff_dump(__isl_keep isl_multi_aff *maff);
 
+ISL_DECLARE_MULTI(pw_aff)
+
 __isl_give isl_pw_multi_aff *isl_pw_multi_aff_identity(
        __isl_take isl_space *space);
 __isl_give isl_pw_multi_aff *isl_pw_multi_aff_from_multi_aff(

diff --git a/include/isl/multi.h b/include/isl/multi.h
index a73f837..dad3cbb 100644 (file)
--- a/include/isl/multi.h
+++ b/include/isl/multi.h
@@ -17,9 +17,6 @@ __isl_give isl_multi_##BASE *isl_multi_##BASE##_set_##BASE(           \
        __isl_take isl_multi_##BASE *multi, int pos,                    \
        __isl_take isl_##BASE *el);
 
-ISL_DECLARE_MULTI(aff)
-ISL_DECLARE_MULTI(pw_aff)
-
 #if defined(__cplusplus)
 }
 #endif