Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-26 16:30:07 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

update latest changes in ivy-ocaml

Browse Source
This commit is contained in:
Gautier Hattenberger
2011-02-08 13:38:59 +01:00
parent 721e404396
commit 11dac0c614
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/lib/ocaml/ivy/cglibivy.c
+4 -4
View File
@@ -20,8 +20,8 @@ value ivy_GtkmainLoop(value unit)
}
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);
extern void cb_read_channel(Channel ch, IVY_HANDLE fd, void *closure);
extern void cb_write_channel(Channel ch, IVY_HANDLE fd, void *closure);
value ivy_GtkchannelSetUp(value fd, value closure_name)
{
@@ -29,9 +29,9 @@ value ivy_GtkchannelSetUp(value fd, value closure_name)
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);
c = IvyChannelAdd((IVY_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);
c = IvyChannelAdd((IVY_HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel, cb_write_channel);
#endif
return Val_int(c);
}
sw/lib/ocaml/ivy/civy.c
+2 -2
View File
@@ -83,11 +83,11 @@ void cb_delete_channel(void *delete_read)
{
}
void cb_write_channel(Channel ch, HANDLE fd, void *closure)
void cb_write_channel(Channel ch, IVY_HANDLE fd, void *closure)
{
}
void cb_read_channel(Channel ch, HANDLE fd, void *closure)
void cb_read_channel(Channel ch, IVY_HANDLE fd, void *closure)
{
callback(*(value*)closure, Val_int(ch));
}
sw/lib/ocaml/ivy/civyloop.c
+4 -4
View File
@@ -39,8 +39,8 @@ value ivy_timerRepeatafter(value nb_ticks,value delay, value closure_name)
read closures */
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);
extern void cb_read_channel(Channel ch, IVY_HANDLE fd, void *closure);
extern void cb_write_channel(Channel ch, IVY_HANDLE fd, void *closure);
value ivy_channelSetUp(value fd, value closure_name)
@@ -49,9 +49,9 @@ value ivy_channelSetUp(value fd, value closure_name)
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);
c = IvyChannelAdd((IVY_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);
c = IvyChannelAdd((IVY_HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel, cb_write_channel);
#endif
return Val_int(c);
}
sw/lib/ocaml/ivy/ctkivy.c
+2 -2
View File
@@ -11,7 +11,7 @@
#include "ivytcl.h"
extern void cb_delete_channel(void *delete_read);
extern void cb_read_channel(Channel ch, HANDLE fd, void *closure);
extern void cb_read_channel(Channel ch, IVY_HANDLE fd, void *closure);
value ivy_TclmainLoop(value unit)
{
@@ -25,7 +25,7 @@ value ivy_TclchannelSetUp(value fd, value closure_name)
Channel c;
value * closure = caml_named_value(String_val(closure_name));
c = IvyTclChannelSetUp((HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel);
c = IvyTclChannelSetUp((IVY_HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel);
return Val_int(c);
}
sw/lib/ocaml/ivy/debian/changelog.3.11.2
+6
View File
@@ -1,3 +1,9 @@
ivy-ocaml (1.1-12) unstable; urgency=low
* Support for ivy-c_3.11.8
-- Gautier Hattenberger <gautier.hattenberger@enac.fr> Wed, 02 Feb 2011 17:49:31 +0100
ivy-ocaml (1.1-11) unstable; urgency=low
* Support of ivy-c_3.11.6, OSX and Linux 64bit