From b71b12982ea418bf965f843147ab6d1f65593c1c Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Mon, 16 Jul 2012 15:44:07 +0200 Subject: [PATCH] isl_multi_templ.c: rename align_params_multi_set_and to include MULTI(BASE) This allows isl_pw_multi.c to be included twice from the same file. Signed-off-by: Sven Verdoolaege --- isl_multi_templ.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/isl_multi_templ.c b/isl_multi_templ.c index aed0dce6..aceb6c6d 100644 --- a/isl_multi_templ.c +++ b/isl_multi_templ.c @@ -343,7 +343,7 @@ error: return NULL; } -static __isl_give MULTI(BASE) *align_params_multi_set_and( +static __isl_give MULTI(BASE) *FN(MULTI(BASE),align_params_multi_set_and)( __isl_take MULTI(BASE) *multi, __isl_take isl_set *set, __isl_give MULTI(BASE) *(*fn)(__isl_take MULTI(BASE) *multi, __isl_take isl_set *set)) @@ -394,7 +394,7 @@ error: __isl_give MULTI(BASE) *FN(MULTI(BASE),gist)(__isl_take MULTI(BASE) *multi, __isl_take isl_set *context) { - return align_params_multi_set_and(multi, context, + return FN(MULTI(BASE),align_params_multi_set_and)(multi, context, &FN(MULTI(BASE),gist_aligned)); } -- 2.11.4.GIT