declare flexarrays of size 1 to silence sun compiler

diff --git a/include/isl_list.h b/include/isl_list.h
index 44055fb..a5e9a44 100644 (file)
--- a/include/isl_list.h
+++ b/include/isl_list.h
@@ -12,7 +12,7 @@ struct isl_basic_set_list {
        int n;
 
        size_t size;
-       struct isl_basic_set *p[0];
+       struct isl_basic_set *p[1];
 };
 
 struct isl_basic_set_list *isl_basic_set_list_alloc(struct isl_ctx *ctx, int n);

diff --git a/include/isl_map.h b/include/isl_map.h
index 64f634a..a785882 100644 (file)
--- a/include/isl_map.h
+++ b/include/isl_map.h
@@ -90,7 +90,7 @@ struct isl_map {
        int n;
 
        size_t size;
-       struct isl_basic_map *p[0];
+       struct isl_basic_map *p[1];
 };
 struct isl_set;
 

diff --git a/include/isl_set.h b/include/isl_set.h
index 40d24e3..b9c5c52 100644 (file)
--- a/include/isl_set.h
+++ b/include/isl_set.h
@@ -62,7 +62,7 @@ struct isl_set {
        int n;
 
        size_t size;
-       struct isl_basic_set *p[0];
+       struct isl_basic_set *p[1];
 };
 
 unsigned isl_basic_set_n_dim(const struct isl_basic_set *bset);

diff --git a/isl_convex_hull.c b/isl_convex_hull.c
index 0bab5fa..4f6ffcd 100644 (file)
--- a/isl_convex_hull.c
+++ b/isl_convex_hull.c
@@ -1973,7 +1973,7 @@ struct sh_data {
        struct isl_ctx          *ctx;
        unsigned                n;
        struct isl_hash_table   *hull_table;
-       struct sh_data_entry    p[0];
+       struct sh_data_entry    p[1];
 };
 
 static void sh_data_free(struct sh_data *data)
@@ -2051,7 +2051,8 @@ static struct sh_data *sh_data_alloc(struct isl_set *set, unsigned n_ineq)
        int i;
 
        data = isl_calloc(set->ctx, struct sh_data,
-               sizeof(struct sh_data) + set->n * sizeof(struct sh_data_entry));
+               sizeof(struct sh_data) +
+               (set->n - 1) * sizeof(struct sh_data_entry));
        if (!data)
                return NULL;
        data->ctx = set->ctx;

diff --git a/isl_list.c b/isl_list.c
index b89078f..cfbff63 100644 (file)
--- a/isl_list.c
+++ b/isl_list.c
@@ -7,7 +7,7 @@ struct isl_basic_set_list *isl_basic_set_list_alloc(struct isl_ctx *ctx, int n)
        isl_assert(ctx, n >= 0, return NULL);
        list = isl_alloc(ctx, struct isl_basic_set_list,
                         sizeof(struct isl_basic_set_list) +
-                        n * sizeof(struct isl_basic_set *));
+                        (n - 1) * sizeof(struct isl_basic_set *));
        if (!list)
                return NULL;
 

diff --git a/isl_map.c b/isl_map.c
index b9e9652..ae2a3c6 100644 (file)
--- a/isl_map.c
+++ b/isl_map.c
@@ -1417,7 +1417,7 @@ struct isl_set *isl_set_alloc_dim(struct isl_dim *dim, int n, unsigned flags)
        isl_assert(dim->ctx, n >= 0, return NULL);
        set = isl_alloc(dim->ctx, struct isl_set,
                        sizeof(struct isl_set) +
-                       n * sizeof(struct isl_basic_set *));
+                       (n - 1) * sizeof(struct isl_basic_set *));
        if (!set)
                goto error;
 
@@ -2663,7 +2663,7 @@ struct isl_map *isl_map_alloc_dim(struct isl_dim *dim, int n, unsigned flags)
        isl_assert(dim->ctx, n >= 0, return NULL);
        map = isl_alloc(dim->ctx, struct isl_map,
                        sizeof(struct isl_map) +
-                       n * sizeof(struct isl_basic_map *));
+                       (n - 1) * sizeof(struct isl_basic_map *));
        if (!map)
                goto error;