Merge branch 'master' of github.com:paparazzi/paparazzi

This commit is contained in:
Antoine Drouin
2010-11-22 16:00:40 +01:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -17,7 +17,7 @@ OCAMLFLAGS =
endif
OCAMLOPTFLAGS=
CFLAGS=-Wall
CFLAGS+=-Wall
OCAMLINC=-I `ocamlc -where`
GLIBINC=`pkg-config --cflags glib-2.0`
+1 -1
View File
@@ -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)