summaryrefslogtreecommitdiff
path: root/byterun
diff options
context:
space:
mode:
authoralainfrisch <alain@frisch.fr>2016-01-27 22:47:31 +0100
committeralainfrisch <alain@frisch.fr>2016-01-27 22:47:31 +0100
commit3878b84d8b8ebfa75522a50e925a8bfccb32fd5a (patch)
treef922b057de3bc570212d83343e277e4858dd9f92 /byterun
parent3f9442604cec9fbb973d3e0891be203688be0d57 (diff)
downloadocaml-3878b84d8b8ebfa75522a50e925a8bfccb32fd5a.tar.gz
Fix for Windows following merge of GPR#22.
Diffstat (limited to 'byterun')
-rw-r--r--byterun/caml/minor_gc.h3
-rw-r--r--byterun/minor_gc.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/byterun/caml/minor_gc.h b/byterun/caml/minor_gc.h
index 668cb2faa3..6e46a5e10c 100644
--- a/byterun/caml/minor_gc.h
+++ b/byterun/caml/minor_gc.h
@@ -77,11 +77,12 @@ static inline void add_to_ref_table (struct caml_ref_table *tbl, value *p)
static inline void add_to_ephe_ref_table (struct caml_ephe_ref_table *tbl,
value ar, mlsize_t offset)
{
+ struct caml_ephe_ref_elt *ephe_ref;
if (tbl->ptr >= tbl->limit){
CAMLassert (tbl->ptr == tbl->limit);
caml_realloc_ephe_ref_table (tbl);
}
- struct caml_ephe_ref_elt *ephe_ref = tbl->ptr++;
+ ephe_ref = tbl->ptr++;
ephe_ref->ephe = ar;
ephe_ref->offset = offset;
}
diff --git a/byterun/minor_gc.c b/byterun/minor_gc.c
index c21aa31864..75be7bdf33 100644
--- a/byterun/minor_gc.c
+++ b/byterun/minor_gc.c
@@ -49,7 +49,7 @@
native code, or [caml_young_trigger].
*/
-struct generic_table CAML_TABLE_STRUCT(void);
+struct generic_table CAML_TABLE_STRUCT(char);
asize_t caml_minor_heap_wsz;
static void *caml_young_base = NULL;