diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2008-12-03 18:09:09 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2008-12-03 18:09:09 +0000 |
| commit | 1f95b175707ec490f8bf08c6c28f2dee203818cb (patch) | |
| tree | f004cd5ba13d81b1182b65def6f3e20c6bda3798 /byterun/startup.c | |
| parent | c52e649d83e34967da0fd2a70faf5c91070c8a91 (diff) | |
| download | ocaml-1f95b175707ec490f8bf08c6c28f2dee203818cb.tar.gz | |
merge changes from 3.10.2merged to 3.11.0
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9153 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'byterun/startup.c')
| -rw-r--r-- | byterun/startup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/byterun/startup.c b/byterun/startup.c index 40db222224..34d6f315c9 100644 --- a/byterun/startup.c +++ b/byterun/startup.c @@ -35,6 +35,7 @@ #include "exec.h" #include "fail.h" #include "fix_code.h" +#include "freelist.h" #include "gc_ctrl.h" #include "instrtrace.h" #include "interp.h" @@ -298,6 +299,7 @@ static void scanmult (char *opt, uintnat *var) static void parse_camlrunparam(void) { char *opt = getenv ("OCAMLRUNPARAM"); + uintnat p; if (opt == NULL) opt = getenv ("CAMLRUNPARAM"); @@ -313,6 +315,7 @@ static void parse_camlrunparam(void) case 'v': scanmult (opt, &caml_verb_gc); break; case 'b': caml_record_backtrace(Val_true); break; case 'p': caml_parser_trace = 1; break; + case 'a': scanmult (opt, &p); caml_set_allocation_policy (p); break; } } } @@ -473,4 +476,3 @@ CAMLexport void caml_startup_code( if (Is_exception_result(res)) caml_fatal_uncaught_exception(Extract_exception(res)); } - |