diff options
author | hattenberger | 2011-02-02 16:58:02 +0000 |
---|---|---|
committer | hattenberger | 2011-02-02 16:58:02 +0000 |
commit | 066e7e9c37a407fc6dfd2d2140d0a23bd4b4c36c (patch) | |
tree | 9b2bf9af70c8b5cf81df76f8703697e13602af9a | |
parent | 93717e0b2c10f79f0456db95a1ab018d15cdbc41 (diff) | |
download | ivy-ocaml-066e7e9c37a407fc6dfd2d2140d0a23bd4b4c36c.zip ivy-ocaml-066e7e9c37a407fc6dfd2d2140d0a23bd4b4c36c.tar.gz ivy-ocaml-066e7e9c37a407fc6dfd2d2140d0a23bd4b4c36c.tar.bz2 ivy-ocaml-066e7e9c37a407fc6dfd2d2140d0a23bd4b4c36c.tar.xz |
Change HANDLE to IVY_HANDLE to match latest ivy-c changes
-rw-r--r-- | cglibivy.c | 8 | ||||
-rw-r--r-- | civy.c | 4 | ||||
-rw-r--r-- | civyloop.c | 8 | ||||
-rw-r--r-- | ctkivy.c | 4 |
4 files changed, 12 insertions, 12 deletions
@@ -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); } @@ -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)); } @@ -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); } @@ -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); } |