diff options
author | Luc Maranget <luc.maranget@inria.fr> | 2014-03-13 15:03:16 +0000 |
---|---|---|
committer | Luc Maranget <luc.maranget@inria.fr> | 2014-03-13 15:03:16 +0000 |
commit | 1338d73c180d22cd2fd2abc5b46554a56f66b1f5 (patch) | |
tree | 1d7171e373a49abdbac5bc790f896aadbca27718 /byterun/gc_ctrl.c | |
parent | 18e6a3781be059367bfff403aa8a41e9dc200844 (diff) | |
download | ocaml-jo401.tar.gz |
Merge jo401 w.r.t ocaml/4.01 from 13776 to 14115jo401
Plus ld.conf changes
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/jo401@14458 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'byterun/gc_ctrl.c')
-rw-r--r-- | byterun/gc_ctrl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/byterun/gc_ctrl.c b/byterun/gc_ctrl.c index 07cfc26d2a..84327fa289 100644 --- a/byterun/gc_ctrl.c +++ b/byterun/gc_ctrl.c @@ -401,7 +401,7 @@ CAMLprim value caml_gc_set(value v) /* Minor heap size comes last because it will trigger a minor collection (thus invalidating [v]) and it can raise [Out_of_memory]. */ - newminsize = norm_minsize (Bsize_wsize (Long_val (Field (v, 0)))); + newminsize = Bsize_wsize (norm_minsize (Long_val (Field (v, 0)))); if (newminsize != caml_minor_heap_size){ caml_gc_message (0x20, "New minor heap size: %luk bytes\n", newminsize/1024); |