From 1bb92dccc29dae60412756e96827569adb8b675f Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Fri, 24 Jun 2011 13:26:17 +0200 Subject: [PATCH] split off type declarations for isl_map and isl_set to separate files Signed-off-by: Sven Verdoolaege --- Makefile.am | 2 ++ include/isl/constraint.h | 2 +- include/isl/flow.h | 4 ++-- include/isl/lp.h | 6 ++++-- include/isl/map.h | 14 +------------- include/isl/map_type.h | 26 ++++++++++++++++++++++++++ include/isl/obj.h | 4 ++-- include/isl/polynomial.h | 2 +- include/isl/set.h | 4 +++- include/isl/set_type.h | 6 ++++++ include/isl/union_map.h | 2 +- include/isl/vertices.h | 2 +- isl_flow.c | 2 ++ isl_obj.c | 2 ++ 14 files changed, 54 insertions(+), 24 deletions(-) create mode 100644 include/isl/map_type.h create mode 100644 include/isl/set_type.h diff --git a/Makefile.am b/Makefile.am index 7019da08..5bb1ba30 100644 --- a/Makefile.am +++ b/Makefile.am @@ -205,6 +205,7 @@ pkginclude_HEADERS = \ include/isl/lp.h \ include/isl/mat.h \ include/isl/map.h \ + include/isl/map_type.h \ include/isl/obj.h \ include/isl/options.h \ include/isl/point.h \ @@ -213,6 +214,7 @@ pkginclude_HEADERS = \ include/isl/schedule.h \ include/isl/seq.h \ include/isl/set.h \ + include/isl/set_type.h \ include/isl/stream.h \ include/isl/union_map.h \ include/isl/union_set.h \ diff --git a/include/isl/constraint.h b/include/isl/constraint.h index f1ba6a89..96ad9014 100644 --- a/include/isl/constraint.h +++ b/include/isl/constraint.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include #if defined(__cplusplus) diff --git a/include/isl/flow.h b/include/isl/flow.h index 839f1427..9606fe97 100644 --- a/include/isl/flow.h +++ b/include/isl/flow.h @@ -1,8 +1,8 @@ #ifndef ISL_FLOW_H #define ISL_FLOW_H -#include -#include +#include +#include #include #include diff --git a/include/isl/lp.h b/include/isl/lp.h index e6c38d7c..9f7a9122 100644 --- a/include/isl/lp.h +++ b/include/isl/lp.h @@ -10,8 +10,10 @@ #ifndef ISL_LP_H #define ISL_LP_H -#include -#include +#include +#include +#include +#include enum isl_lp_result { isl_lp_error = -1, diff --git a/include/isl/map.h b/include/isl/map.h index 0afcba35..c93907a4 100644 --- a/include/isl/map.h +++ b/include/isl/map.h @@ -23,6 +23,7 @@ #include #include #include +#include #if defined(__cplusplus) extern "C" { @@ -42,19 +43,6 @@ extern "C" { * reference to the old structure(s), use the appropriate _copy function. */ -struct isl_basic_map; -typedef struct isl_basic_map isl_basic_map; -#ifndef isl_basic_set -struct isl_basic_set; -typedef struct isl_basic_set isl_basic_set; -#endif -struct isl_map; -typedef struct isl_map isl_map; -#ifndef isl_set -struct isl_set; -typedef struct isl_set isl_set; -#endif - unsigned isl_basic_map_n_in(const struct isl_basic_map *bmap); unsigned isl_basic_map_n_out(const struct isl_basic_map *bmap); unsigned isl_basic_map_n_param(const struct isl_basic_map *bmap); diff --git a/include/isl/map_type.h b/include/isl/map_type.h new file mode 100644 index 00000000..1ba26e0d --- /dev/null +++ b/include/isl/map_type.h @@ -0,0 +1,26 @@ +#ifndef ISL_MAP_TYPE_H +#define ISL_MAP_TYPE_H + +#if defined(__cplusplus) +extern "C" { +#endif + +struct isl_basic_map; +typedef struct isl_basic_map isl_basic_map; +struct isl_map; +typedef struct isl_map isl_map; + +#ifndef isl_basic_set +struct isl_basic_set; +typedef struct isl_basic_set isl_basic_set; +#endif +#ifndef isl_set +struct isl_set; +typedef struct isl_set isl_set; +#endif + +#if defined(__cplusplus) +} +#endif + +#endif diff --git a/include/isl/obj.h b/include/isl/obj.h index e08040fe..b2a6afc8 100644 --- a/include/isl/obj.h +++ b/include/isl/obj.h @@ -1,8 +1,8 @@ #ifndef ISL_OBJ_H #define ISL_OBJ_H -#include -#include +#include +#include #include #include #include diff --git a/include/isl/polynomial.h b/include/isl/polynomial.h index f1315f61..6cc90832 100644 --- a/include/isl/polynomial.h +++ b/include/isl/polynomial.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/isl/set.h b/include/isl/set.h index 9c058a36..c5b43eb8 100644 --- a/include/isl/set.h +++ b/include/isl/set.h @@ -10,8 +10,10 @@ #ifndef ISL_SET_H #define ISL_SET_H -#include +#include +#include #include +#include #include #include diff --git a/include/isl/set_type.h b/include/isl/set_type.h new file mode 100644 index 00000000..ce349e1b --- /dev/null +++ b/include/isl/set_type.h @@ -0,0 +1,6 @@ +#ifndef ISL_SET_TYPE_H +#define ISL_SET_TYPE_H + +#include + +#endif diff --git a/include/isl/union_map.h b/include/isl/union_map.h index b1b87bb5..7f5d4c46 100644 --- a/include/isl/union_map.h +++ b/include/isl/union_map.h @@ -2,7 +2,7 @@ #define ISL_UNION_MAP_H #include -#include +#include #include #if defined(__cplusplus) diff --git a/include/isl/vertices.h b/include/isl/vertices.h index fee5537d..3e8460d6 100644 --- a/include/isl/vertices.h +++ b/include/isl/vertices.h @@ -1,7 +1,7 @@ #ifndef ISL_VERTICES_H #define ISL_VERTICES_H -#include +#include #if defined(__cplusplus) extern "C" { diff --git a/isl_flow.c b/isl_flow.c index d27937cf..6dd6ff50 100644 --- a/isl_flow.c +++ b/isl_flow.c @@ -13,6 +13,8 @@ * ZAC des vignes, 4 rue Jacques Monod, 91893 Orsay, France */ +#include +#include #include /* A private structure to keep track of a mapping together with diff --git a/isl_obj.c b/isl_obj.c index fb9fe975..928982da 100644 --- a/isl_obj.c +++ b/isl_obj.c @@ -8,6 +8,8 @@ * 91893 Orsay, France */ +#include +#include #include struct isl_int_obj { -- 2.11.4.GIT