[paparazzi-commits] [4594] update for Ivy C 3.11

[Pascal Brisset]

Revision: 4594
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4594
Author:   hecto
Date:     2010-02-25 10:24:22 +0000 (Thu, 25 Feb 2010)
Log Message:
-----------
 update for Ivy C 3.11

Modified Paths:
--------------
    paparazzi3/trunk/sw/lib/ocaml/ivy/cglibivy.c
    paparazzi3/trunk/sw/lib/ocaml/ivy/civy.c
    paparazzi3/trunk/sw/lib/ocaml/ivy/civyloop.c

Modified: paparazzi3/trunk/sw/lib/ocaml/ivy/cglibivy.c
===================================================================
--- paparazzi3/trunk/sw/lib/ocaml/ivy/cglibivy.c        2010-02-25 09:59:02 UTC 
(rev 4593)
+++ paparazzi3/trunk/sw/lib/ocaml/ivy/cglibivy.c        2010-02-25 10:24:22 UTC 
(rev 4594)
@@ -5,6 +5,7 @@
 #include <Ivy/timer.h>
 #include <Ivy/ivychannel.h>
 #include <Ivy/ivyglibloop.h>
+#include <Ivy/version.h>
 #include <glib.h>
 #include <caml/mlvalues.h>
 #include <caml/fail.h>
@@ -20,13 +21,18 @@
 
 extern void cb_delete_channel(void *delete_read);
 extern void cb_read_channel(Channel ch, HANDLE fd, void *closure);
+extern void cb_write_channel(Channel ch, HANDLE fd, void *closure);
 
 value ivy_GtkchannelSetUp(value fd, value closure_name)
 {
   Channel c;
   value * closure = caml_named_value(String_val(closure_name));
 
+#if IVYMINOR_VERSION == 8
   c = IvyChannelAdd((HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, 
cb_read_channel);
+#else
+  c = IvyChannelAdd((HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, 
cb_read_channel, cb_write_channel);
+#endif
   return Val_int(c);
 }
 

Modified: paparazzi3/trunk/sw/lib/ocaml/ivy/civy.c
===================================================================
--- paparazzi3/trunk/sw/lib/ocaml/ivy/civy.c    2010-02-25 09:59:02 UTC (rev 
4593)
+++ paparazzi3/trunk/sw/lib/ocaml/ivy/civy.c    2010-02-25 10:24:22 UTC (rev 
4594)
@@ -83,6 +83,9 @@
 {
 }
 
+void cb_write_channel(Channel ch, HANDLE fd, void *closure)
+{
+}
 
 void cb_read_channel(Channel ch, HANDLE fd, void *closure)
 {

Modified: paparazzi3/trunk/sw/lib/ocaml/ivy/civyloop.c
===================================================================
--- paparazzi3/trunk/sw/lib/ocaml/ivy/civyloop.c        2010-02-25 09:59:02 UTC 
(rev 4593)
+++ paparazzi3/trunk/sw/lib/ocaml/ivy/civyloop.c        2010-02-25 10:24:22 UTC 
(rev 4594)
@@ -5,6 +5,7 @@
 #include <Ivy/ivy.h>
 #include <Ivy/ivyloop.h>
 #include <Ivy/timer.h>
+#include <Ivy/version.h>
 #include <caml/mlvalues.h>
 #include <caml/fail.h>
 #include <caml/callback.h>
@@ -13,7 +14,11 @@
 
 value ivy_mainLoop(value unit)
 {
-  IvyMainLoop (NULL, NULL);
+#if IVYMINOR_VERSION == 8
+  IvyMainLoop (NULL,NULL);
+#else
+  IvyMainLoop ();
+#endif
   return Val_unit;
 }
 
@@ -33,8 +38,9 @@
 /* Data associated to Channel callbacks is the couple of delete and
 read closures */
 
-void cb_delete_channel(void *delete_read);
-void cb_read_channel(Channel ch, HANDLE fd, void *closure);
+extern void cb_delete_channel(void *delete_read);
+extern void cb_read_channel(Channel ch, HANDLE fd, void *closure);
+extern void cb_write_channel(Channel ch, HANDLE fd, void *closure);
 
 
 value ivy_channelSetUp(value fd, value closure_name)
@@ -42,7 +48,11 @@
   Channel c;
   value * closure = caml_named_value(String_val(closure_name));
 
+#if IVYMINOR_VERSION == 8
   c = IvyChannelAdd((HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, 
cb_read_channel);
+#else
+  c = IvyChannelAdd((HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, 
cb_read_channel, cb_write_channel);
+#endif
   return Val_int(c);
 }