summaryrefslogtreecommitdiff
path: root/byterun/startup.c
diff options
context:
space:
mode:
authorDamien Doligez <damien.doligez-inria.fr>2011-07-20 09:17:07 +0000
committerDamien Doligez <damien.doligez-inria.fr>2011-07-20 09:17:07 +0000
commitc91db736b18c7ed0ec81596b76874f5423d5d331 (patch)
treea967edfcd254aa6844c44e81ea33596a82b7bf87 /byterun/startup.c
parent46d5420ca9c695738f7a0baa527d3591d95f067a (diff)
downloadocaml-c91db736b18c7ed0ec81596b76874f5423d5d331.tar.gz
merge changes from 3.12.0 to 3.12.1
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11123 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'byterun/startup.c')
-rw-r--r--byterun/startup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/byterun/startup.c b/byterun/startup.c
index b69c04f220..20e61e7d2f 100644
--- a/byterun/startup.c
+++ b/byterun/startup.c
@@ -288,7 +288,7 @@ static int parse_command_line(char **argv)
static void scanmult (char *opt, uintnat *var)
{
char mult = ' ';
- int val;
+ unsigned int val;
sscanf (opt, "=%u%c", &val, &mult);
sscanf (opt, "=0x%x%c", &val, &mult);
switch (mult) {