From f3c292bf31fbb13ce50a8877ee71910897276a24 Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Thu, 21 Jan 2010 11:31:18 +0100 Subject: [PATCH] Rename headers from isl_header.h to isl/header.h We need to turn on the nostdinc option of automake as otherwise it would include -I$(top_builddir)/include/isl in DEFAULT_INCLUDES because of AC_CONFIG_HEADERS(include/isl/config.h) in configure.ac. Signed-off-by: Sven Verdoolaege --- .gitignore | 8 +-- Makefile.am | 90 ++++++++++++-------------- basis_reduction_tab.c | 2 +- bound.c | 2 +- cat.c | 6 +- closure.c | 2 +- configure.ac | 7 +- doc/user.pod | 55 +++++++++------- include/{isl_arg.h => isl/arg.h} | 0 include/{isl_blk.h => isl/blk.h} | 2 +- include/{isl_config.h.in => isl/config.h.in} | 0 include/{isl_constraint.h => isl/constraint.h} | 4 +- include/{isl_ctx.h => isl/ctx.h} | 10 +-- include/{isl_dim.h => isl/dim.h} | 2 +- include/{isl_div.h => isl/div.h} | 4 +- include/{isl_flow.h => isl/flow.h} | 8 +-- include/{isl_hash.h => isl/hash.h} | 2 +- include/{isl_ilp.h => isl/ilp.h} | 2 +- include/{isl_int.h => isl/int.h} | 2 +- include/{isl_list.h => isl/list.h} | 2 +- include/{isl_lp.h => isl/lp.h} | 4 +- include/{isl_map.h => isl/map.h} | 14 ++-- include/{isl_mat.h => isl/mat.h} | 8 +-- include/{isl_obj.h => isl/obj.h} | 12 ++-- include/{isl_options.h => isl/options.h} | 2 +- include/{isl_point.h => isl/point.h} | 0 include/{isl_polynomial.h => isl/polynomial.h} | 16 ++--- include/{isl_printer.h => isl/printer.h} | 2 +- include/{isl_seq.h => isl/seq.h} | 4 +- include/{isl_set.h => isl/set.h} | 6 +- include/{isl_stream.h => isl/stream.h} | 4 +- include/{isl_union_map.h => isl/union_map.h} | 6 +- include/{isl_union_set.h => isl/union_set.h} | 4 +- include/{isl_vec.h => isl/vec.h} | 6 +- include/{isl_version.h => isl/version.h} | 0 include/{isl_vertices.h => isl/vertices.h} | 2 +- isl_affine_hull.c | 10 +-- isl_arg.c | 4 +- isl_basis_reduction.h | 2 +- isl_bernstein.c | 4 +- isl_blk.c | 4 +- isl_bound.h | 2 +- isl_coalesce.c | 2 +- isl_constraint.c | 4 +- isl_convex_hull.c | 8 +-- isl_ctx.c | 4 +- isl_dim_private.h | 4 +- isl_div.c | 6 +- isl_equalities.c | 2 +- isl_equalities.h | 4 +- isl_factorization.h | 2 +- isl_flow.c | 2 +- isl_fold.c | 4 +- isl_gmp.c | 2 +- isl_hash.c | 4 +- isl_ilp.c | 4 +- isl_input.c | 12 ++-- isl_list.c | 4 +- isl_lp.c | 6 +- isl_lp_piplib.c | 6 +- isl_lp_piplib.h | 2 +- isl_map.c | 16 ++--- isl_map_no_piplib.c | 2 +- isl_map_piplib.c | 8 +-- isl_map_piplib.h | 2 +- isl_map_private.h | 6 +- isl_map_simplify.c | 4 +- isl_map_subtract.c | 6 +- isl_mat.c | 4 +- isl_mat_private.h | 2 +- isl_morph.c | 2 +- isl_morph.h | 6 +- isl_name.h | 2 +- isl_obj.c | 2 +- isl_options.c | 6 +- isl_output.c | 6 +- isl_piplib.h | 6 +- isl_point.c | 4 +- isl_point_private.h | 6 +- isl_polynomial.c | 4 +- isl_polynomial_private.h | 8 +-- isl_printer_private.h | 2 +- isl_range.c | 4 +- isl_reordering.h | 2 +- isl_sample.c | 6 +- isl_sample.h | 2 +- isl_sample_piplib.c | 6 +- isl_sample_piplib.h | 2 +- isl_scan.c | 2 +- isl_scan.h | 4 +- isl_seq.c | 2 +- isl_stream.c | 4 +- isl_tab.c | 2 +- isl_tab.h | 8 +-- isl_tab_pip.c | 2 +- isl_test.c | 12 ++-- isl_transitive_closure.c | 8 +-- isl_union_map.c | 10 +-- isl_union_map_private.h | 2 +- isl_vec.c | 4 +- isl_vertices.c | 4 +- isl_vertices_private.h | 4 +- pip.c | 6 +- polyhedron_detect_equalities.c | 2 +- polyhedron_minimize.c | 8 +-- polyhedron_sample.c | 2 +- polytope_scan.c | 2 +- 107 files changed, 312 insertions(+), 310 deletions(-) rename include/{isl_arg.h => isl/arg.h} (100%) rename include/{isl_blk.h => isl/blk.h} (97%) rename include/{isl_config.h.in => isl/config.h.in} (100%) rename include/{isl_constraint.h => isl/constraint.h} (98%) rename include/{isl_ctx.h => isl/ctx.h} (97%) rename include/{isl_dim.h => isl/dim.h} (99%) rename include/{isl_div.h => isl/div.h} (97%) rename include/{isl_flow.h => isl/flow.h} (94%) rename include/{isl_hash.h => isl/hash.h} (98%) rename include/{isl_ilp.h => isl/ilp.h} (96%) rename include/{isl_int.h => isl/int.h} (99%) rename include/{isl_list.h => isl/list.h} (97%) rename include/{isl_lp.h => isl/lp.h} (96%) rename include/{isl_map.h => isl/map.h} (99%) rename include/{isl_mat.h => isl/mat.h} (98%) rename include/{isl_obj.h => isl/obj.h} (90%) rename include/{isl_options.h => isl/options.h} (98%) rename include/{isl_point.h => isl/point.h} (100%) rename include/{isl_polynomial.h => isl/polynomial.h} (99%) rename include/{isl_printer.h => isl/printer.h} (98%) rename include/{isl_seq.h => isl/seq.h} (97%) rename include/{isl_set.h => isl/set.h} (99%) rename include/{isl_stream.h => isl/stream.h} (98%) rename include/{isl_union_map.h => isl/union_map.h} (98%) rename include/{isl_union_set.h => isl/union_set.h} (98%) rename include/{isl_vec.h => isl/vec.h} (95%) rename include/{isl_version.h => isl/version.h} (100%) rename include/{isl_vertices.h => isl/vertices.h} (98%) diff --git a/.gitignore b/.gitignore index 8dc933c..0f9686b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,8 @@ Makefile.in aclocal.m4 autom4te.cache/ config.guess -config.h -config.h.in +isl_config.h +isl_config.h.in config.log config.status config.sub @@ -20,8 +20,8 @@ depcomp doc/Makefile doc/Makefile.in gitversion.h -include/isl_config.h -include/isl_stdint.h +include/isl/config.h +include/isl/stdint.h include/stamp-h2 install-sh isl-uninstalled.pc diff --git a/Makefile.am b/Makefile.am index 12c7e2d..578981d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,7 @@ SUBDIRS = . doc DIST_SUBDIRS = doc ACLOCAL_AMFLAGS = -I m4 +AUTOMAKE_OPTIONS = nostdinc lib_LTLIBRARIES = libisl.la noinst_PROGRAMS = isl_test isl_polyhedron_sample isl_pip \ @@ -28,6 +29,8 @@ if NEED_GET_MEMORY_FUNCTIONS GET_MEMORY_FUNCTIONS=mp_get_memory_functions.c endif +INCLUDES = -I. -I$(srcdir) -I$(srcdir)/include -Iinclude/ + libisl_la_SOURCES = \ $(ISL_PIPLIB) \ $(GET_MEMORY_FUNCTIONS) \ @@ -113,91 +116,82 @@ EXTRA_libisl_la_SOURCES = \ libisl_la_LIBADD = @PIPLIB_LIBS@ -lgmp libisl_la_LDFLAGS = -version-info @versioninfo@ \ @PIPLIB_LDFLAGS@ @GMP_LDFLAGS@ -libisl_la_CPPFLAGS = -I$(srcdir)/include -Iinclude/ \ - @PIPLIB_CPPFLAGS@ @GMP_CPPFLAGS@ +libisl_la_CPPFLAGS = $(INCLUDES) @PIPLIB_CPPFLAGS@ @GMP_CPPFLAGS@ -isl_test_CPPFLAGS = -I$(srcdir)/include -Iinclude/ @GMP_CPPFLAGS@ +isl_test_CPPFLAGS = $(INCLUDES) @GMP_CPPFLAGS@ isl_test_LDADD = libisl.la -isl_polyhedron_sample_CPPFLAGS = -I$(srcdir)/include -Iinclude/ \ - @GMP_CPPFLAGS@ +isl_polyhedron_sample_CPPFLAGS = $(INCLUDES) @GMP_CPPFLAGS@ isl_polyhedron_sample_LDADD = libisl.la isl_polyhedron_sample_SOURCES = \ polyhedron_sample.c -isl_pip_CPPFLAGS = -I$(srcdir)/include -Iinclude/ \ - @GMP_CPPFLAGS@ +isl_pip_CPPFLAGS = $(INCLUDES) @GMP_CPPFLAGS@ isl_pip_LDADD = libisl.la isl_pip_SOURCES = \ pip.c -isl_bound_CPPFLAGS = -I$(srcdir)/include -Iinclude/ \ - @GMP_CPPFLAGS@ +isl_bound_CPPFLAGS = $(INCLUDES) @GMP_CPPFLAGS@ isl_bound_LDADD = libisl.la isl_bound_SOURCES = \ bound.c -isl_polyhedron_minimize_CPPFLAGS = -I$(srcdir)/include -Iinclude/ \ - @GMP_CPPFLAGS@ +isl_polyhedron_minimize_CPPFLAGS = $(INCLUDES) @GMP_CPPFLAGS@ isl_polyhedron_minimize_LDADD = libisl.la isl_polyhedron_minimize_SOURCES = \ polyhedron_minimize.c -isl_polytope_scan_CPPFLAGS = -I$(srcdir)/include -Iinclude/ \ - @GMP_CPPFLAGS@ +isl_polytope_scan_CPPFLAGS = $(INCLUDES) @GMP_CPPFLAGS@ isl_polytope_scan_LDADD = libisl.la isl_polytope_scan_SOURCES = \ polytope_scan.c -isl_polyhedron_detect_equalities_CPPFLAGS = -I$(srcdir)/include -Iinclude/ \ - @GMP_CPPFLAGS@ +isl_polyhedron_detect_equalities_CPPFLAGS = $(INCLUDES) @GMP_CPPFLAGS@ isl_polyhedron_detect_equalities_LDADD = libisl.la isl_polyhedron_detect_equalities_SOURCES = \ polyhedron_detect_equalities.c -isl_cat_CPPFLAGS = -I$(srcdir)/include -Iinclude/ \ - @GMP_CPPFLAGS@ +isl_cat_CPPFLAGS = $(INCLUDES) @GMP_CPPFLAGS@ isl_cat_LDADD = libisl.la isl_cat_SOURCES = \ cat.c -isl_closure_CPPFLAGS = -I$(srcdir)/include -Iinclude/ \ - @GMP_CPPFLAGS@ +isl_closure_CPPFLAGS = $(INCLUDES) @GMP_CPPFLAGS@ isl_closure_LDADD = libisl.la isl_closure_SOURCES = \ closure.c nodist_pkginclude_HEADERS = \ - include/isl_config.h \ - include/isl_stdint.h + include/isl/config.h \ + include/isl/stdint.h pkginclude_HEADERS = \ - include/isl_arg.h \ - include/isl_blk.h \ - include/isl_constraint.h \ - include/isl_ctx.h \ - include/isl_dim.h \ - include/isl_div.h \ - include/isl_flow.h \ - include/isl_ilp.h \ - include/isl_int.h \ - include/isl_hash.h \ - include/isl_list.h \ - include/isl_lp.h \ - include/isl_mat.h \ - include/isl_map.h \ - include/isl_obj.h \ - include/isl_options.h \ - include/isl_point.h \ - include/isl_polynomial.h \ - include/isl_printer.h \ - include/isl_seq.h \ - include/isl_set.h \ - include/isl_stream.h \ - include/isl_union_map.h \ - include/isl_union_set.h \ - include/isl_vec.h \ - include/isl_version.h \ - include/isl_vertices.h + include/isl/arg.h \ + include/isl/blk.h \ + include/isl/constraint.h \ + include/isl/ctx.h \ + include/isl/dim.h \ + include/isl/div.h \ + include/isl/flow.h \ + include/isl/ilp.h \ + include/isl/int.h \ + include/isl/hash.h \ + include/isl/list.h \ + include/isl/lp.h \ + include/isl/mat.h \ + include/isl/map.h \ + include/isl/obj.h \ + include/isl/options.h \ + include/isl/point.h \ + include/isl/polynomial.h \ + include/isl/printer.h \ + include/isl/seq.h \ + include/isl/set.h \ + include/isl/stream.h \ + include/isl/union_map.h \ + include/isl/union_set.h \ + include/isl/vec.h \ + include/isl/version.h \ + include/isl/vertices.h EXTRA_DIST = \ basis_reduction_templ.c \ diff --git a/basis_reduction_tab.c b/basis_reduction_tab.c index aebf897..4c3f99f 100644 --- a/basis_reduction_tab.c +++ b/basis_reduction_tab.c @@ -8,7 +8,7 @@ */ #include -#include "isl_seq.h" +#include #include "isl_tab.h" struct tab_lp { diff --git a/bound.c b/bound.c index ae81543..5b50fa2 100644 --- a/bound.c +++ b/bound.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/cat.c b/cat.c index e40e83e..f278e9c 100644 --- a/cat.c +++ b/cat.c @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include +#include +#include struct isl_arg_choice cat_format[] = { {"isl", ISL_FORMAT_ISL}, diff --git a/closure.c b/closure.c index f80ccac..43d69d4 100644 --- a/closure.c +++ b/closure.c @@ -1,5 +1,5 @@ #include -#include +#include int main(int argc, char **argv) { diff --git a/configure.ac b/configure.ac index be4baf8..82fff9a 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_CHECK_PROG(POD2HTML, pod2html, pod2html, []) AM_CONDITIONAL(GENERATE_DOC, test -n "$PERL" -a -n "$PDFLATEX" -a -n "$POD2HTML") -AX_CREATE_STDINT_H(include/isl_stdint.h) +AX_CREATE_STDINT_H(include/isl/stdint.h) AX_SUBMODULE(gmp,system,system) @@ -81,14 +81,13 @@ if test "$with_piplib" != "no"; then fi AM_CONDITIONAL(HAVE_PIPLIB, test x$have_piplib = xtrue) -PACKAGE_CFLAGS="-I$prefix/include/isl" AX_CREATE_PKGCONFIG_INFO AX_DETECT_GIT_HEAD echo '#define GIT_HEAD_ID "'$GIT_HEAD_ID'"' > gitversion.h -AC_CONFIG_HEADERS(config.h) -AC_CONFIG_HEADERS(include/isl_config.h) +AC_CONFIG_HEADERS(isl_config.h) +AC_CONFIG_HEADERS(include/isl/config.h) AC_CONFIG_FILES(Makefile) AC_CONFIG_FILES(doc/Makefile) AC_CONFIG_COMMANDS_POST([ diff --git a/doc/user.pod b/doc/user.pod index 44cb37a..b205951 100644 --- a/doc/user.pod +++ b/doc/user.pod @@ -46,6 +46,15 @@ renamed to C. =back +=head3 Changes since isl-0.04 + +=over + +=item * All header files have been renamed from C +to C. + +=back + =head1 Installation The source of C can be obtained either as a tarball @@ -373,7 +382,7 @@ a C value for an C<__isl_take> argument. Whenever a new set or relation is created from scratch, its dimension needs to be specified using an C. - #include + #include __isl_give isl_dim *isl_dim_alloc(isl_ctx *ctx, unsigned nparam, unsigned n_in, unsigned n_out); __isl_give isl_dim *isl_dim_set_alloc(isl_ctx *ctx, @@ -401,25 +410,25 @@ by creating the new objects L) based on the dimension specification of the original object. - #include + #include __isl_give isl_dim *isl_basic_set_get_dim( __isl_keep isl_basic_set *bset); __isl_give isl_dim *isl_set_get_dim(__isl_keep isl_set *set); - #include + #include __isl_give isl_dim *isl_union_set_get_dim( __isl_keep isl_union_set *uset); - #include + #include __isl_give isl_dim *isl_basic_map_get_dim( __isl_keep isl_basic_map *bmap); __isl_give isl_dim *isl_map_get_dim(__isl_keep isl_map *map); - #include + #include __isl_give isl_dim *isl_union_map_get_dim( __isl_keep isl_union_map *umap); - #include + #include __isl_give isl_dim *isl_qpolynomial_get_dim( __isl_keep isl_qpolynomial *qp); __isl_give isl_dim *isl_pw_qpolynomial_get_dim( @@ -432,7 +441,7 @@ specification of the original object. The names of the individual dimensions may be set or read off using the following functions. - #include + #include __isl_give isl_dim *isl_dim_set_name(__isl_take isl_dim *dim, enum isl_dim_type type, unsigned pos, __isl_keep const char *name); @@ -454,7 +463,7 @@ the arguments. The names of entire spaces may be set or read off using the following functions. - #include + #include __isl_give isl_dim *isl_dim_set_tuple_name( __isl_take isl_dim *dim, enum isl_dim_type type, const char *s); @@ -473,7 +482,7 @@ the domain or range of a relation can be a nested relation. The following functions can be used to construct and deconstruct such nested dimension specifications. - #include + #include int isl_dim_is_wrapping(__isl_keep isl_dim *dim); __isl_give isl_dim *isl_dim_wrap(__isl_take isl_dim *dim); __isl_give isl_dim *isl_dim_unwrap(__isl_take isl_dim *dim); @@ -565,7 +574,7 @@ dimensions is zero. =head3 Input - #include + #include __isl_give isl_basic_set *isl_basic_set_read_from_file( isl_ctx *ctx, FILE *input, int nparam); __isl_give isl_basic_set *isl_basic_set_read_from_str( @@ -575,7 +584,7 @@ dimensions is zero. __isl_give isl_set *isl_set_read_from_str(isl_ctx *ctx, const char *str, int nparam); - #include + #include __isl_give isl_basic_map *isl_basic_map_read_from_file( isl_ctx *ctx, FILE *input, int nparam); __isl_give isl_basic_map *isl_basic_map_read_from_str( @@ -585,11 +594,11 @@ dimensions is zero. __isl_give isl_map *isl_map_read_from_str(isl_ctx *ctx, const char *str, int nparam); - #include + #include __isl_give isl_union_set *isl_union_set_read_from_str( struct isl_ctx *ctx, const char *str); - #include + #include __isl_give isl_union_map *isl_union_map_read_from_str( struct isl_ctx *ctx, const char *str); @@ -638,7 +647,7 @@ of the parameters. To actually print something, use - #include + #include __isl_give isl_printer *isl_printer_print_basic_set( __isl_take isl_printer *printer, __isl_keep isl_basic_set *bset); @@ -646,7 +655,7 @@ To actually print something, use __isl_take isl_printer *printer, __isl_keep isl_set *set); - #include + #include __isl_give isl_printer *isl_printer_print_basic_map( __isl_take isl_printer *printer, __isl_keep isl_basic_map *bmap); @@ -654,12 +663,12 @@ To actually print something, use __isl_take isl_printer *printer, __isl_keep isl_map *map); - #include + #include __isl_give isl_printer *isl_printer_print_union_set( __isl_take isl_printer *p, __isl_keep isl_union_set *uset); - #include + #include __isl_give isl_printer *isl_printer_print_union_map( __isl_take isl_printer *p, __isl_keep isl_union_map *umap); @@ -792,7 +801,7 @@ existentially quantified variables, if any. Constraints can be constructed, manipulated and added to basic sets and relations using the following functions. - #include + #include __isl_give isl_constraint *isl_equality_alloc( __isl_take isl_dim *dim); __isl_give isl_constraint *isl_inequality_alloc( @@ -974,7 +983,7 @@ from To iterate over the constraints of a basic set or map, use - #include + #include int isl_basic_map_foreach_constraint( __isl_keep isl_basic_map *bmap, @@ -1665,7 +1674,7 @@ In case of union relations, the optimum is computed per space. Matrices can be created, copied and freed using the following functions. - #include + #include __isl_give isl_mat *isl_mat_alloc(struct isl_ctx *ctx, unsigned n_row, unsigned n_col); __isl_give isl_mat *isl_mat_copy(__isl_keep isl_mat *mat); @@ -2263,7 +2272,7 @@ then memory based dependence analysis is performed. If, on the other hand, all sources are I accesses, then value based dependence analysis is performed. - #include + #include typedef int (*isl_access_level_before)(void *first, void *second); @@ -2350,7 +2359,7 @@ C to free all associated memory. A higher-level interface to dependence analysis is provided by the following function. - #include + #include int isl_union_map_compute_flow(__isl_take isl_union_map *sink, __isl_take isl_union_map *must_source, @@ -2375,7 +2384,7 @@ The parametric vertex enumeration described in this section is mainly intended to be used internally and by the C library. - #include + #include __isl_give isl_vertices *isl_basic_set_compute_vertices( __isl_keep isl_basic_set *bset); diff --git a/include/isl_arg.h b/include/isl/arg.h similarity index 100% rename from include/isl_arg.h rename to include/isl/arg.h diff --git a/include/isl_blk.h b/include/isl/blk.h similarity index 97% rename from include/isl_blk.h rename to include/isl/blk.h index b6242c7..8094e2a 100644 --- a/include/isl_blk.h +++ b/include/isl/blk.h @@ -10,7 +10,7 @@ #ifndef ISL_BLK_H #define ISL_BLK_H -#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_config.h.in b/include/isl/config.h.in similarity index 100% rename from include/isl_config.h.in rename to include/isl/config.h.in diff --git a/include/isl_constraint.h b/include/isl/constraint.h similarity index 98% rename from include/isl_constraint.h rename to include/isl/constraint.h index 6c1a48b..369f499 100644 --- a/include/isl_constraint.h +++ b/include/isl/constraint.h @@ -10,8 +10,8 @@ #ifndef ISL_CONSTRAINT_H #define ISL_CONSTRAINT_H -#include "isl_div.h" -#include "isl_set.h" +#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_ctx.h b/include/isl/ctx.h similarity index 97% rename from include/isl_ctx.h rename to include/isl/ctx.h index 8a79231..223c61e 100644 --- a/include/isl_ctx.h +++ b/include/isl/ctx.h @@ -13,11 +13,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #define __isl_give #define __isl_take diff --git a/include/isl_dim.h b/include/isl/dim.h similarity index 99% rename from include/isl_dim.h rename to include/isl/dim.h index 2d95077..41361d6 100644 --- a/include/isl_dim.h +++ b/include/isl/dim.h @@ -10,7 +10,7 @@ #ifndef ISL_DIM_H #define ISL_DIM_H -#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_div.h b/include/isl/div.h similarity index 97% rename from include/isl_div.h rename to include/isl/div.h index 175ed67..d7df544 100644 --- a/include/isl_div.h +++ b/include/isl/div.h @@ -10,8 +10,8 @@ #ifndef ISL_DIV_H #define ISL_DIV_H -#include "isl_dim.h" -#include "isl_set.h" +#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_flow.h b/include/isl/flow.h similarity index 94% rename from include/isl_flow.h rename to include/isl/flow.h index b3d868b..9394094 100644 --- a/include/isl_flow.h +++ b/include/isl/flow.h @@ -1,10 +1,10 @@ #ifndef ISL_FLOW_H #define ISL_FLOW_H -#include -#include -#include -#include +#include +#include +#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_hash.h b/include/isl/hash.h similarity index 98% rename from include/isl_hash.h rename to include/isl/hash.h index 53eda85..654b6b6 100644 --- a/include/isl_hash.h +++ b/include/isl/hash.h @@ -11,7 +11,7 @@ #define ISL_HASH_H #include -#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_ilp.h b/include/isl/ilp.h similarity index 96% rename from include/isl_ilp.h rename to include/isl/ilp.h index 1ae331b..f7db311 100644 --- a/include/isl_ilp.h +++ b/include/isl/ilp.h @@ -10,7 +10,7 @@ #ifndef ISL_ILP_H #define ISL_ILP_H -#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_int.h b/include/isl/int.h similarity index 99% rename from include/isl_int.h rename to include/isl/int.h index aa3e401..2d017ce 100644 --- a/include/isl_int.h +++ b/include/isl/int.h @@ -10,7 +10,7 @@ #ifndef ISL_INT_H #define ISL_INT_H -#include +#include #include #include #if defined(__cplusplus) diff --git a/include/isl_list.h b/include/isl/list.h similarity index 97% rename from include/isl_list.h rename to include/isl/list.h index 0385a8b..77926c6 100644 --- a/include/isl_list.h +++ b/include/isl/list.h @@ -10,7 +10,7 @@ #ifndef ISL_LIST_H #define ISL_LIST_H -#include +#include struct isl_basic_set; diff --git a/include/isl_lp.h b/include/isl/lp.h similarity index 96% rename from include/isl_lp.h rename to include/isl/lp.h index 99b91a6..e6c38d7 100644 --- a/include/isl_lp.h +++ b/include/isl/lp.h @@ -10,8 +10,8 @@ #ifndef ISL_LP_H #define ISL_LP_H -#include -#include +#include +#include enum isl_lp_result { isl_lp_error = -1, diff --git a/include/isl_map.h b/include/isl/map.h similarity index 99% rename from include/isl_map.h rename to include/isl/map.h index 38058d3..d6e9d11 100644 --- a/include/isl_map.h +++ b/include/isl/map.h @@ -12,13 +12,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_mat.h b/include/isl/mat.h similarity index 98% rename from include/isl_mat.h rename to include/isl/mat.h index 8536df1..a5d077b 100644 --- a/include/isl_mat.h +++ b/include/isl/mat.h @@ -12,10 +12,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_obj.h b/include/isl/obj.h similarity index 90% rename from include/isl_obj.h rename to include/isl/obj.h index 30227dd..66ef37b 100644 --- a/include/isl_obj.h +++ b/include/isl/obj.h @@ -1,12 +1,12 @@ #ifndef ISL_OBJ_H #define ISL_OBJ_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_options.h b/include/isl/options.h similarity index 98% rename from include/isl_options.h rename to include/isl/options.h index 056e73a..9d0df51 100644 --- a/include/isl_options.h +++ b/include/isl/options.h @@ -10,7 +10,7 @@ #ifndef ISL_OPTIONS_H #define ISL_OPTIONS_H -#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_point.h b/include/isl/point.h similarity index 100% rename from include/isl_point.h rename to include/isl/point.h diff --git a/include/isl_polynomial.h b/include/isl/polynomial.h similarity index 99% rename from include/isl_polynomial.h rename to include/isl/polynomial.h index 10d8218..23d85b8 100644 --- a/include/isl_polynomial.h +++ b/include/isl/polynomial.h @@ -1,14 +1,14 @@ #ifndef ISL_POLYNOMIAL_H #define ISL_POLYNOMIAL_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_printer.h b/include/isl/printer.h similarity index 98% rename from include/isl_printer.h rename to include/isl/printer.h index d0430c0..1af408f 100644 --- a/include/isl_printer.h +++ b/include/isl/printer.h @@ -2,7 +2,7 @@ #define ISL_PRINTER_H #include -#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_seq.h b/include/isl/seq.h similarity index 97% rename from include/isl_seq.h rename to include/isl/seq.h index 6ea309c..fd65562 100644 --- a/include/isl_seq.h +++ b/include/isl/seq.h @@ -11,8 +11,8 @@ #define ISL_SEQ_H #include -#include -#include +#include +#include /* Some common operations on sequences of isl_int's */ diff --git a/include/isl_set.h b/include/isl/set.h similarity index 99% rename from include/isl_set.h rename to include/isl/set.h index fe133fa..4157ac3 100644 --- a/include/isl_set.h +++ b/include/isl/set.h @@ -10,9 +10,9 @@ #ifndef ISL_SET_H #define ISL_SET_H -#include "isl_map.h" -#include "isl_list.h" -#include +#include +#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_stream.h b/include/isl/stream.h similarity index 98% rename from include/isl_stream.h rename to include/isl/stream.h index 20f7a2f..12e17f5 100644 --- a/include/isl_stream.h +++ b/include/isl/stream.h @@ -11,8 +11,8 @@ #define ISL_STREAM_H #include -#include -#include +#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_union_map.h b/include/isl/union_map.h similarity index 98% rename from include/isl_union_map.h rename to include/isl/union_map.h index 97d7004..c119e0c 100644 --- a/include/isl_union_map.h +++ b/include/isl/union_map.h @@ -1,9 +1,9 @@ #ifndef ISL_UNION_MAP_H #define ISL_UNION_MAP_H -#include -#include -#include +#include +#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_union_set.h b/include/isl/union_set.h similarity index 98% rename from include/isl_union_set.h rename to include/isl/union_set.h index ae2161d..ecfc678 100644 --- a/include/isl_union_set.h +++ b/include/isl/union_set.h @@ -1,8 +1,8 @@ #ifndef ISL_UNION_SET_H #define ISL_UNION_SET_H -#include -#include +#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_vec.h b/include/isl/vec.h similarity index 95% rename from include/isl_vec.h rename to include/isl/vec.h index f1f2078..a50a6fa 100644 --- a/include/isl_vec.h +++ b/include/isl/vec.h @@ -12,9 +12,9 @@ #include -#include -#include -#include +#include +#include +#include #if defined(__cplusplus) extern "C" { diff --git a/include/isl_version.h b/include/isl/version.h similarity index 100% rename from include/isl_version.h rename to include/isl/version.h diff --git a/include/isl_vertices.h b/include/isl/vertices.h similarity index 98% rename from include/isl_vertices.h rename to include/isl/vertices.h index e9738fe..fee5537 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_affine_hull.c b/isl_affine_hull.c index cc4baf0..9f53a07 100644 --- a/isl_affine_hull.c +++ b/isl_affine_hull.c @@ -7,11 +7,11 @@ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium */ -#include "isl_ctx.h" -#include "isl_seq.h" -#include "isl_set.h" -#include "isl_lp.h" -#include "isl_map.h" +#include +#include +#include +#include +#include #include "isl_map_private.h" #include "isl_equalities.h" #include "isl_sample.h" diff --git a/isl_arg.c b/isl_arg.c index 8f7ac1d..c6ffa14 100644 --- a/isl_arg.c +++ b/isl_arg.c @@ -11,8 +11,8 @@ #include #include -#include "isl_arg.h" -#include +#include +#include static void set_default_choice(struct isl_arg *arg, void *opt) { diff --git a/isl_basis_reduction.h b/isl_basis_reduction.h index 9b9b721..fd63560 100644 --- a/isl_basis_reduction.h +++ b/isl_basis_reduction.h @@ -10,7 +10,7 @@ #ifndef ISL_BASIS_REDUCTION_H #define ISL_BASIS_REDUCTION_H -#include "isl_set.h" +#include #include #include "isl_tab.h" diff --git a/isl_bernstein.c b/isl_bernstein.c index 2700e82..9b8571a 100644 --- a/isl_bernstein.c +++ b/isl_bernstein.c @@ -13,8 +13,8 @@ * ZAC des vignes, 4 rue Jacques Monod, 91893 Orsay, France */ -#include -#include +#include +#include #include #include #include diff --git a/isl_blk.c b/isl_blk.c index 53465ab..9adb690 100644 --- a/isl_blk.c +++ b/isl_blk.c @@ -7,8 +7,8 @@ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium */ -#include "isl_blk.h" -#include "isl_ctx.h" +#include +#include struct isl_blk isl_blk_empty() { diff --git a/isl_bound.h b/isl_bound.h index b02a0b3..5ec8bc9 100644 --- a/isl_bound.h +++ b/isl_bound.h @@ -1,7 +1,7 @@ #ifndef ISL_BOUND_H #define ISL_BOUND_H -#include +#include struct isl_bound { /* input */ diff --git a/isl_coalesce.c b/isl_coalesce.c index f39a5e1..22524aa 100644 --- a/isl_coalesce.c +++ b/isl_coalesce.c @@ -11,7 +11,7 @@ */ #include "isl_map_private.h" -#include "isl_seq.h" +#include #include "isl_tab.h" #include diff --git a/isl_constraint.c b/isl_constraint.c index 1cce16e..760f9e5 100644 --- a/isl_constraint.c +++ b/isl_constraint.c @@ -10,9 +10,9 @@ * ZAC des vignes, 4 rue Jacques Monod, 91893 Orsay, France */ -#include +#include #include -#include "isl_seq.h" +#include #include "isl_map_private.h" static unsigned n(struct isl_constraint *c, enum isl_dim_type type) diff --git a/isl_convex_hull.c b/isl_convex_hull.c index 1552492..40cca1b 100644 --- a/isl_convex_hull.c +++ b/isl_convex_hull.c @@ -7,12 +7,12 @@ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium */ -#include "isl_lp.h" -#include "isl_map.h" +#include +#include #include "isl_map_private.h" #include -#include "isl_set.h" -#include "isl_seq.h" +#include +#include #include "isl_equalities.h" #include "isl_tab.h" diff --git a/isl_ctx.c b/isl_ctx.c index 1cab6ad..5f0b2a6 100644 --- a/isl_ctx.c +++ b/isl_ctx.c @@ -7,8 +7,8 @@ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium */ -#include "isl_ctx.h" -#include "isl_vec.h" +#include +#include static struct isl_options *find_nested_options(struct isl_arg *arg, void *opt, struct isl_arg *wanted) diff --git a/isl_dim_private.h b/isl_dim_private.h index 04b1958..0b4931c 100644 --- a/isl_dim_private.h +++ b/isl_dim_private.h @@ -1,5 +1,5 @@ -#include -#include +#include +#include struct isl_name; struct isl_dim { diff --git a/isl_div.c b/isl_div.c index 5b9f324..a259772 100644 --- a/isl_div.c +++ b/isl_div.c @@ -7,11 +7,11 @@ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium */ -#include -#include +#include +#include #include #include "isl_map_private.h" -#include "isl_seq.h" +#include static unsigned n(struct isl_div *d, enum isl_dim_type type) { diff --git a/isl_equalities.c b/isl_equalities.c index 8c36dbc..31e3b9c 100644 --- a/isl_equalities.c +++ b/isl_equalities.c @@ -8,7 +8,7 @@ */ #include -#include "isl_seq.h" +#include #include "isl_map_private.h" #include "isl_equalities.h" diff --git a/isl_equalities.h b/isl_equalities.h index cc0cc25..ceb5544 100644 --- a/isl_equalities.h +++ b/isl_equalities.h @@ -10,8 +10,8 @@ #ifndef ISL_EQUALITIES_H #define ISL_EQUALITIES_H -#include -#include +#include +#include #if defined(__cplusplus) extern "C" { diff --git a/isl_factorization.h b/isl_factorization.h index 3fae67c..f0d3518 100644 --- a/isl_factorization.h +++ b/isl_factorization.h @@ -1,4 +1,4 @@ -#include +#include #include #if defined(__cplusplus) diff --git a/isl_flow.c b/isl_flow.c index 4f4b0fc..e9752fc 100644 --- a/isl_flow.c +++ b/isl_flow.c @@ -13,7 +13,7 @@ * ZAC des vignes, 4 rue Jacques Monod, 91893 Orsay, France */ -#include +#include /* A private structure to keep track of a mapping together with * a user-specified identifier and a boolean indicating whether diff --git a/isl_fold.c b/isl_fold.c index 38fbf99..43425b0 100644 --- a/isl_fold.c +++ b/isl_fold.c @@ -13,8 +13,8 @@ #include #include #include -#include -#include +#include +#include #include static __isl_give isl_qpolynomial_fold *qpolynomial_fold_alloc( diff --git a/isl_gmp.c b/isl_gmp.c index 82b776d..0c8db59 100644 --- a/isl_gmp.c +++ b/isl_gmp.c @@ -7,7 +7,7 @@ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium */ -#include "isl_int.h" +#include uint32_t isl_gmp_hash(mpz_t v, uint32_t hash) { diff --git a/isl_hash.c b/isl_hash.c index b7bac23..365082c 100644 --- a/isl_hash.c +++ b/isl_hash.c @@ -8,8 +8,8 @@ */ #include -#include "isl_hash.h" -#include "isl_ctx.h" +#include +#include uint32_t isl_hash_string(uint32_t hash, const char *s) { diff --git a/isl_ilp.c b/isl_ilp.c index 5548ffe..f3a7928 100644 --- a/isl_ilp.c +++ b/isl_ilp.c @@ -7,10 +7,10 @@ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium */ -#include "isl_ilp.h" +#include #include "isl_map_private.h" #include "isl_sample.h" -#include "isl_seq.h" +#include #include "isl_equalities.h" /* Given a basic set "bset", construct a basic set U such that for diff --git a/isl_input.c b/isl_input.c index 9c9c298..b8836d7 100644 --- a/isl_input.c +++ b/isl_input.c @@ -14,14 +14,14 @@ #include #include #include -#include -#include -#include -#include "isl_stream.h" +#include +#include +#include +#include #include "isl_map_private.h" -#include "isl_obj.h" +#include #include "isl_polynomial_private.h" -#include +#include #include struct variable { diff --git a/isl_list.c b/isl_list.c index e800076..db2a608 100644 --- a/isl_list.c +++ b/isl_list.c @@ -7,8 +7,8 @@ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium */ -#include "isl_list.h" -#include "isl_set.h" +#include +#include struct isl_basic_set_list *isl_basic_set_list_alloc(struct isl_ctx *ctx, int n) { diff --git a/isl_lp.c b/isl_lp.c index 57b425a..31fd4c7 100644 --- a/isl_lp.c +++ b/isl_lp.c @@ -7,10 +7,10 @@ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium */ -#include "isl_ctx.h" -#include "isl_lp.h" +#include +#include #include "isl_lp_piplib.h" -#include "isl_seq.h" +#include #include "isl_tab.h" #include "isl_map_private.h" diff --git a/isl_lp_piplib.c b/isl_lp_piplib.c index dd7f5b4..7ee0bec 100644 --- a/isl_lp_piplib.c +++ b/isl_lp_piplib.c @@ -7,9 +7,9 @@ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium */ -#include "isl_map.h" -#include "isl_vec.h" -#include "isl_lp.h" +#include +#include +#include #include "isl_piplib.h" #include "isl_map_piplib.h" diff --git a/isl_lp_piplib.h b/isl_lp_piplib.h index 73dfadd..e69a3b4 100644 --- a/isl_lp_piplib.h +++ b/isl_lp_piplib.h @@ -10,7 +10,7 @@ #ifndef ISL_LP_PIPLIB_H #define ISL_LP_PIPLIB_H -#include +#include #if defined(__cplusplus) extern "C" { diff --git a/isl_map.c b/isl_map.c index d2b64c8..969fc51 100644 --- a/isl_map.c +++ b/isl_map.c @@ -12,21 +12,21 @@ #include #include -#include "isl_ctx.h" -#include "isl_blk.h" +#include +#include #include "isl_dim_private.h" #include "isl_equalities.h" -#include "isl_list.h" -#include "isl_lp.h" -#include "isl_seq.h" -#include "isl_set.h" -#include "isl_map.h" +#include +#include +#include +#include +#include #include "isl_map_private.h" #include "isl_map_piplib.h" #include #include "isl_sample.h" #include "isl_tab.h" -#include "isl_vec.h" +#include #include /* Maps dst positions to src positions */ diff --git a/isl_map_no_piplib.c b/isl_map_no_piplib.c index c7b6eb3..8a28b07 100644 --- a/isl_map_no_piplib.c +++ b/isl_map_no_piplib.c @@ -8,7 +8,7 @@ */ #include "isl_map_piplib.h" -#include "isl_set.h" +#include struct isl_map *isl_pip_basic_map_lexopt( struct isl_basic_map *bmap, struct isl_basic_set *dom, diff --git a/isl_map_piplib.c b/isl_map_piplib.c index 65a9f67..a7019b5 100644 --- a/isl_map_piplib.c +++ b/isl_map_piplib.c @@ -7,10 +7,10 @@ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium */ -#include "isl_set.h" -#include "isl_map.h" -#include "isl_mat.h" -#include "isl_seq.h" +#include +#include +#include +#include #include "isl_piplib.h" #include "isl_map_piplib.h" #include "isl_map_private.h" diff --git a/isl_map_piplib.h b/isl_map_piplib.h index 6c2594f..e796e4a 100644 --- a/isl_map_piplib.h +++ b/isl_map_piplib.h @@ -10,7 +10,7 @@ #ifndef ISL_MAP_PIPLIB_H #define ISL_MAP_PIPLIB_H -#include +#include #if defined(__cplusplus) extern "C" { diff --git a/isl_map_private.h b/isl_map_private.h index 5066be2..c1a98d1 100644 --- a/isl_map_private.h +++ b/isl_map_private.h @@ -10,10 +10,10 @@ #ifndef ISL_MAP_PRIVATE_H #define ISL_MAP_PRIVATE_H -#include "isl_set.h" -#include "isl_map.h" +#include +#include #include -#include "isl_vec.h" +#include __isl_give isl_map *isl_map_realign(__isl_take isl_map *map, __isl_take isl_reordering *r); diff --git a/isl_map_simplify.c b/isl_map_simplify.c index a596cd5..03bdc73 100644 --- a/isl_map_simplify.c +++ b/isl_map_simplify.c @@ -8,9 +8,9 @@ */ #include "isl_equalities.h" -#include "isl_map.h" +#include #include "isl_map_private.h" -#include "isl_seq.h" +#include #include "isl_tab.h" #include #include diff --git a/isl_map_subtract.c b/isl_map_subtract.c index 53664c5..59df4b1 100644 --- a/isl_map_subtract.c +++ b/isl_map_subtract.c @@ -7,9 +7,9 @@ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium */ -#include "isl_seq.h" -#include "isl_set.h" -#include "isl_map.h" +#include +#include +#include #include "isl_map_private.h" #include "isl_tab.h" #include diff --git a/isl_mat.c b/isl_mat.c index 1b6be62..c152779 100644 --- a/isl_mat.c +++ b/isl_mat.c @@ -7,8 +7,8 @@ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium */ -#include "isl_dim.h" -#include "isl_seq.h" +#include +#include #include #include "isl_map_private.h" #include diff --git a/isl_mat_private.h b/isl_mat_private.h index ef7474e..de2cc20 100644 --- a/isl_mat_private.h +++ b/isl_mat_private.h @@ -1,4 +1,4 @@ -#include +#include struct isl_mat { int ref; diff --git a/isl_morph.c b/isl_morph.c index ca404cd..7e24907 100644 --- a/isl_morph.c +++ b/isl_morph.c @@ -9,7 +9,7 @@ */ #include -#include +#include #include #include #include diff --git a/isl_morph.h b/isl_morph.h index 4e04ca7..bbffe4b 100644 --- a/isl_morph.h +++ b/isl_morph.h @@ -12,9 +12,9 @@ #define ISL_MORHP_H #include -#include -#include -#include +#include +#include +#include #if defined(__cplusplus) extern "C" { diff --git a/isl_name.h b/isl_name.h index 5381c94..2910b76 100644 --- a/isl_name.h +++ b/isl_name.h @@ -10,7 +10,7 @@ #ifndef ISL_NAME_H #define ISL_NAME_H -#include +#include #if defined(__cplusplus) extern "C" { diff --git a/isl_obj.c b/isl_obj.c index 5fa218e..625a76e 100644 --- a/isl_obj.c +++ b/isl_obj.c @@ -8,7 +8,7 @@ * 91893 Orsay, France */ -#include +#include static void *isl_obj_map_copy(void *v) { diff --git a/isl_options.c b/isl_options.c index 28afd33..4766c36 100644 --- a/isl_options.c +++ b/isl_options.c @@ -11,9 +11,9 @@ #include #include -#include "isl_ctx.h" -#include "isl_options.h" -#include +#include +#include +#include struct isl_arg_choice isl_lp_solver_choice[] = { {"tab", ISL_LP_TAB}, diff --git a/isl_output.c b/isl_output.c index 305b9cb..05f36eb 100644 --- a/isl_output.c +++ b/isl_output.c @@ -12,14 +12,14 @@ #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include static const char *s_to[2] = { " -> ", " \\to " }; static const char *s_and[2] = { " and ", " \\wedge " }; diff --git a/isl_piplib.h b/isl_piplib.h index 43136a8..8408770 100644 --- a/isl_piplib.h +++ b/isl_piplib.h @@ -10,9 +10,9 @@ #ifndef ISL_PIPLIB_H #define ISL_PIPLIB_H -#include -#include -#include +#include +#include +#include #ifndef ISL_PIPLIB #error "no piplib" #endif diff --git a/isl_point.c b/isl_point.c index 58d09fd..152e9b0 100644 --- a/isl_point.c +++ b/isl_point.c @@ -1,9 +1,9 @@ #include -#include +#include #include #include #include -#include +#include #include __isl_give isl_point *isl_point_alloc(__isl_take isl_dim *dim, diff --git a/isl_point_private.h b/isl_point_private.h index fbf1ee9..327f55f 100644 --- a/isl_point_private.h +++ b/isl_point_private.h @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include struct isl_point { int ref; diff --git a/isl_polynomial.c b/isl_polynomial.c index caa951e..8acfa98 100644 --- a/isl_polynomial.c +++ b/isl_polynomial.c @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/isl_polynomial_private.h b/isl_polynomial_private.h index 1e4295c..10682b0 100644 --- a/isl_polynomial_private.h +++ b/isl_polynomial_private.h @@ -1,9 +1,9 @@ #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include struct isl_upoly { diff --git a/isl_printer_private.h b/isl_printer_private.h index ac2ae1e..9d76808 100644 --- a/isl_printer_private.h +++ b/isl_printer_private.h @@ -1,4 +1,4 @@ -#include +#include struct isl_printer_ops; diff --git a/isl_range.c b/isl_range.c index 5a43b3f..bd831c8 100644 --- a/isl_range.c +++ b/isl_range.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include #include diff --git a/isl_reordering.h b/isl_reordering.h index 0afb554..cfec95a 100644 --- a/isl_reordering.h +++ b/isl_reordering.h @@ -1,7 +1,7 @@ #ifndef ISL_REORDERING_H #define ISL_REORDERING_H -#include +#include /* pos maps original dimensions to new dimensions. * The final dimension is given by dim. diff --git a/isl_sample.c b/isl_sample.c index 2bd7c6b..e12fb9c 100644 --- a/isl_sample.c +++ b/isl_sample.c @@ -9,9 +9,9 @@ #include "isl_sample.h" #include "isl_sample_piplib.h" -#include "isl_vec.h" -#include "isl_mat.h" -#include "isl_seq.h" +#include +#include +#include #include "isl_map_private.h" #include "isl_equalities.h" #include "isl_tab.h" diff --git a/isl_sample.h b/isl_sample.h index 4361e80..b657e6e 100644 --- a/isl_sample.h +++ b/isl_sample.h @@ -10,7 +10,7 @@ #ifndef ISL_SAMPLE_H #define ISL_SAMPLE -#include +#include #include #if defined(__cplusplus) diff --git a/isl_sample_piplib.c b/isl_sample_piplib.c index 0ed40fc..d7c1a73 100644 --- a/isl_sample_piplib.c +++ b/isl_sample_piplib.c @@ -7,9 +7,9 @@ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium */ -#include "isl_mat.h" -#include "isl_vec.h" -#include "isl_seq.h" +#include +#include +#include #include "isl_piplib.h" #include "isl_sample_piplib.h" diff --git a/isl_sample_piplib.h b/isl_sample_piplib.h index 44292f5..52f2156 100644 --- a/isl_sample_piplib.h +++ b/isl_sample_piplib.h @@ -10,7 +10,7 @@ #ifndef ISL_SAMPLE_PIP_H #define ISL_SAMPLE_PIP -#include +#include #if defined(__cplusplus) extern "C" { diff --git a/isl_scan.c b/isl_scan.c index c8eba37..4b15c96 100644 --- a/isl_scan.c +++ b/isl_scan.c @@ -9,7 +9,7 @@ #include "isl_basis_reduction.h" #include "isl_scan.h" -#include "isl_seq.h" +#include #include "isl_tab.h" #include diff --git a/isl_scan.h b/isl_scan.h index 21a2499..8e5ad74 100644 --- a/isl_scan.h +++ b/isl_scan.h @@ -10,8 +10,8 @@ #ifndef ISL_SCAN_H #define ISL_SCAN_H -#include "isl_set.h" -#include "isl_vec.h" +#include +#include struct isl_scan_callback { int (*add)(struct isl_scan_callback *cb, __isl_take isl_vec *sample); diff --git a/isl_seq.c b/isl_seq.c index 5747b39..36d6b65 100644 --- a/isl_seq.c +++ b/isl_seq.c @@ -7,7 +7,7 @@ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium */ -#include "isl_seq.h" +#include void isl_seq_clr(isl_int *p, unsigned len) { diff --git a/isl_stream.c b/isl_stream.c index b134aca..e114900 100644 --- a/isl_stream.c +++ b/isl_stream.c @@ -10,8 +10,8 @@ #include #include #include -#include -#include "isl_stream.h" +#include +#include struct isl_keyword { char *name; diff --git a/isl_tab.c b/isl_tab.c index 7a71ce6..a747ec5 100644 --- a/isl_tab.c +++ b/isl_tab.c @@ -10,7 +10,7 @@ #include #include "isl_map_private.h" #include "isl_tab.h" -#include "isl_seq.h" +#include /* * The implementation of tableaus in this file was inspired by Section 8 diff --git a/isl_tab.h b/isl_tab.h index f288c0c..51a0afc 100644 --- a/isl_tab.h +++ b/isl_tab.h @@ -10,10 +10,10 @@ #ifndef ISL_TAB_H #define ISL_TAB_H -#include "isl_lp.h" -#include "isl_map.h" -#include "isl_mat.h" -#include "isl_set.h" +#include +#include +#include +#include struct isl_tab_var { int index; diff --git a/isl_tab_pip.c b/isl_tab_pip.c index 34e1b92..acf6ead 100644 --- a/isl_tab_pip.c +++ b/isl_tab_pip.c @@ -8,7 +8,7 @@ */ #include "isl_map_private.h" -#include "isl_seq.h" +#include #include "isl_tab.h" #include "isl_sample.h" #include diff --git a/isl_test.c b/isl_test.c index c67a09e..a5f9072 100644 --- a/isl_test.c +++ b/isl_test.c @@ -10,12 +10,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include static char *srcdir; diff --git a/isl_transitive_closure.c b/isl_transitive_closure.c index bfe9990..4ca369a 100644 --- a/isl_transitive_closure.c +++ b/isl_transitive_closure.c @@ -8,12 +8,12 @@ * 91893 Orsay, France */ -#include "isl_map.h" +#include #include "isl_map_private.h" -#include "isl_seq.h" +#include #include -#include -#include +#include +#include #include int isl_map_is_transitively_closed(__isl_keep isl_map *map) diff --git a/isl_union_map.c b/isl_union_map.c index bccf34d..2374cd1 100644 --- a/isl_union_map.c +++ b/isl_union_map.c @@ -8,14 +8,14 @@ * 91893 Orsay, France */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include +#include static __isl_give isl_union_map *isl_union_map_alloc(__isl_take isl_dim *dim, int size) diff --git a/isl_union_map_private.h b/isl_union_map_private.h index 2022a0f..2abd4ff 100644 --- a/isl_union_map_private.h +++ b/isl_union_map_private.h @@ -1,5 +1,5 @@ #define isl_union_set isl_union_map -#include +#include struct isl_union_map { int ref; diff --git a/isl_vec.c b/isl_vec.c index b8524ae..00b0332 100644 --- a/isl_vec.c +++ b/isl_vec.c @@ -7,8 +7,8 @@ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium */ -#include "isl_seq.h" -#include "isl_vec.h" +#include +#include struct isl_vec *isl_vec_alloc(struct isl_ctx *ctx, unsigned size) { diff --git a/isl_vertices.c b/isl_vertices.c index e9fd6f6..e87e965 100644 --- a/isl_vertices.c +++ b/isl_vertices.c @@ -8,8 +8,8 @@ * 91893 Orsay, France */ -#include -#include +#include +#include #include #include #include diff --git a/isl_vertices_private.h b/isl_vertices_private.h index eed4a30..7c707fd 100644 --- a/isl_vertices_private.h +++ b/isl_vertices_private.h @@ -1,5 +1,5 @@ -#include -#include +#include +#include #if defined(__cplusplus) extern "C" { diff --git a/pip.c b/pip.c index 1053eff..38ebce3 100644 --- a/pip.c +++ b/pip.c @@ -9,13 +9,13 @@ #include #include -#include "isl_set.h" +#include #include "isl_tab.h" #include "isl_map_private.h" #include "isl_sample.h" #include "isl_scan.h" -#include "isl_seq.h" -#include "isl_ilp.h" +#include +#include #include /* The input of this program is the same as that of the "example" program diff --git a/polyhedron_detect_equalities.c b/polyhedron_detect_equalities.c index 7b069f9..9acea32 100644 --- a/polyhedron_detect_equalities.c +++ b/polyhedron_detect_equalities.c @@ -7,7 +7,7 @@ * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium */ -#include "isl_set.h" +#include int main(int argc, char **argv) { diff --git a/polyhedron_minimize.c b/polyhedron_minimize.c index 53a35d5..d27d290 100644 --- a/polyhedron_minimize.c +++ b/polyhedron_minimize.c @@ -8,10 +8,10 @@ */ #include -#include "isl_set.h" -#include "isl_vec.h" -#include "isl_ilp.h" -#include "isl_seq.h" +#include +#include +#include +#include /* The input of this program is the same as that of the "polytope_minimize" * program from the barvinok distribution. diff --git a/polyhedron_sample.c b/polyhedron_sample.c index 6b07c7f..7d4fe18 100644 --- a/polyhedron_sample.c +++ b/polyhedron_sample.c @@ -9,7 +9,7 @@ #include #include "isl_sample.h" -#include "isl_vec.h" +#include #include "isl_map_private.h" int main(int argc, char **argv) diff --git a/polytope_scan.c b/polytope_scan.c index 269bd81..ca2d9e8 100644 --- a/polytope_scan.c +++ b/polytope_scan.c @@ -9,7 +9,7 @@ #include #include "isl_equalities.h" -#include "isl_seq.h" +#include #include "isl_scan.h" #include -- 2.7.4