diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2013-09-04 15:12:37 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2013-09-04 15:12:37 +0000 |
| commit | 7844495624be79259e613182e6a615319b2f4376 (patch) | |
| tree | 8656b9339174ab9061b42be2b50c2d9563401c8a /byterun/gc_ctrl.c | |
| parent | e9723139769a4df610fadba0fdeecab298c1c17e (diff) | |
| download | ocaml-7844495624be79259e613182e6a615319b2f4376.tar.gz | |
Merge branch 4.01 from branching point to 4.01.0+rc1
Command line used:
svn merge --accept postpone -r 13776:14055 $REPO/version/4.01 .
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14060 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); |