From c086ae20e24cbe8f6f8c86b52e59d7496a8f852a Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 21 Nov 2010 18:58:40 +1030 Subject: [PATCH 1/2] Makefile now uses CFLAGS properly --- sw/lib/ocaml/ivy/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/lib/ocaml/ivy/Makefile b/sw/lib/ocaml/ivy/Makefile index 8d7d35e4e1..e738db897c 100644 --- a/sw/lib/ocaml/ivy/Makefile +++ b/sw/lib/ocaml/ivy/Makefile @@ -17,7 +17,7 @@ OCAMLFLAGS = endif OCAMLOPTFLAGS= -CFLAGS=-Wall +CFLAGS+=-Wall OCAMLINC=-I `ocamlc -where` GLIBINC=`pkg-config --cflags glib-2.0` From 7bfdeb7f21b57d156f847410a998969807a28944 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 22 Nov 2010 15:26:53 +1030 Subject: [PATCH 2/2] ivy-ocaml update --- sw/lib/ocaml/ivy/civyloop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/lib/ocaml/ivy/civyloop.c b/sw/lib/ocaml/ivy/civyloop.c index 529e5dae1f..d774e9923c 100644 --- a/sw/lib/ocaml/ivy/civyloop.c +++ b/sw/lib/ocaml/ivy/civyloop.c @@ -25,7 +25,7 @@ value ivy_mainLoop(value unit) void timer_cb(TimerId id, void *data, unsigned long delta) { value closure = *(value*)data; - callback(closure, Val_long((int) id)); + callback(closure, Val_long(id)); } value ivy_timerRepeatafter(value nb_ticks,value delay, value closure_name)