From 5aadc07ba64a146d888cea708d40e1a155a18f67 Mon Sep 17 00:00:00 2001
From: Sven Verdoolaege <skimo@kotnet.org>
Date: Sun, 28 Nov 2010 18:22:21 +0100
Subject: [PATCH] separate out isl interface

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
---
 Makefile.am         |  1 +
 barvinok/barvinok.h | 22 ++--------------------
 barvinok/isl.h      | 31 +++++++++++++++++++++++++++++++
 iscc.c              |  3 ++-
 4 files changed, 36 insertions(+), 21 deletions(-)
 create mode 100644 barvinok/isl.h

diff --git a/Makefile.am b/Makefile.am
index 80a6b33..6fbf719 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,6 +71,7 @@ noinst_PROGRAMS = test testlib randomtest \
 EXTRA_PROGRAMS = cone_hilbert_basis
 pkginclude_HEADERS = \
     barvinok/NTL_QQ.h \
+    barvinok/isl.h \
     barvinok/barvinok.h \
     barvinok/util.h \
     barvinok/evalue.h \
diff --git a/barvinok/barvinok.h b/barvinok/barvinok.h
index a0492bd..b0fe378 100644
--- a/barvinok/barvinok.h
+++ b/barvinok/barvinok.h
@@ -1,32 +1,14 @@
 #ifndef BARVINOK_H
 #define BARVINOK_H
 
-#include <isl/polynomial.h>
-#include <isl/union_set.h>
+#include <barvinok/isl.h>
 #include <barvinok/evalue.h>
+#include <barvinok/options.h>
 
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
-__isl_give isl_pw_qpolynomial *isl_set_card(__isl_take isl_set *set);
-__isl_give isl_pw_qpolynomial *isl_map_card(__isl_take isl_map *map);
-__isl_give isl_union_pw_qpolynomial *isl_union_set_card(
-	__isl_take isl_union_set *uset);
-__isl_give isl_union_pw_qpolynomial *isl_union_map_card(
-	__isl_take isl_union_map *umap);
-__isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_sum(
-	__isl_take isl_pw_qpolynomial *pwqp);
-__isl_give isl_union_pw_qpolynomial *isl_union_pw_qpolynomial_sum(
-	__isl_take isl_union_pw_qpolynomial *upwqp);
-__isl_give isl_pw_qpolynomial *isl_map_apply_pw_qpolynomial(
-	__isl_take isl_map *map, __isl_take isl_pw_qpolynomial *pwqp);
-__isl_give isl_union_pw_qpolynomial *isl_union_map_apply_union_pw_qpolynomial(
-	__isl_take isl_union_map *umap,
-	__isl_take isl_union_pw_qpolynomial *upwqp);
-
-#include <barvinok/options.h>
-
 void barvinok_decompose(Polyhedron *C, Polyhedron **ppos, Polyhedron **pneg);
 void barvinok_count(Polyhedron *P, Value* result, unsigned NbMaxCons);
 void barvinok_count_with_options(Polyhedron *P, Value* result,
diff --git a/barvinok/isl.h b/barvinok/isl.h
new file mode 100644
index 0000000..fe5bd40
--- /dev/null
+++ b/barvinok/isl.h
@@ -0,0 +1,31 @@
+#ifndef BARVINOK_ISL_H
+#define BARVINOK_ISL_H
+
+#include <isl/polynomial.h>
+#include <isl/union_set.h>
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+__isl_give isl_pw_qpolynomial *isl_set_card(__isl_take isl_set *set);
+__isl_give isl_pw_qpolynomial *isl_map_card(__isl_take isl_map *map);
+__isl_give isl_union_pw_qpolynomial *isl_union_set_card(
+	__isl_take isl_union_set *uset);
+__isl_give isl_union_pw_qpolynomial *isl_union_map_card(
+	__isl_take isl_union_map *umap);
+__isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_sum(
+	__isl_take isl_pw_qpolynomial *pwqp);
+__isl_give isl_union_pw_qpolynomial *isl_union_pw_qpolynomial_sum(
+	__isl_take isl_union_pw_qpolynomial *upwqp);
+__isl_give isl_pw_qpolynomial *isl_map_apply_pw_qpolynomial(
+	__isl_take isl_map *map, __isl_take isl_pw_qpolynomial *pwqp);
+__isl_give isl_union_pw_qpolynomial *isl_union_map_apply_union_pw_qpolynomial(
+	__isl_take isl_union_map *umap,
+	__isl_take isl_union_pw_qpolynomial *upwqp);
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif
diff --git a/iscc.c b/iscc.c
index c10f7c0..cf30a9f 100644
--- a/iscc.c
+++ b/iscc.c
@@ -6,7 +6,8 @@
 #include <isl/vertices.h>
 #include <isl_obj_list.h>
 #include <isl_obj_str.h>
-#include <barvinok/barvinok.h>
+#include <barvinok/isl.h>
+#include <barvinok/options.h>
 
 #include "config.h"
 
-- 
2.11.4.GIT