1 files changed, 14 insertions, 7 deletions
diff --git a/ctkivy.c b/ctkivy.c
index 87b7eb6..3b436e4 100644
--- a/ctkivy.c
+++ b/ctkivy.c
@@ -2,16 +2,16 @@
 #include <string.h>
 #include <stdio.h>
 #include <getopt.h>
-#include <timer.h>
+#include <Ivy/timer.h>
+#include <Ivy/ivychannel.h>
+#include <Ivy/ivytcl.h>
+#include <Ivy/version.h>
+#include <tk.h>
 #include <caml/mlvalues.h>
 #include <caml/fail.h>
 #include <caml/callback.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>
-#include "ivytcl.h"
-
-extern void cb_delete_channel(void *delete_read);
-extern void cb_read_channel(Channel ch, IVY_HANDLE fd, void *closure);
 
 value ivy_TclmainLoop(value unit)
 {
@@ -19,18 +19,25 @@ value ivy_TclmainLoop(value unit)
   return Val_unit;
 }
 
+extern void cb_delete_channel(void *delete_read);
+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_TclchannelSetUp(value fd, value closure_name)
 {
   Channel c;
   value * closure = caml_named_value(String_val(closure_name));
 
-  c = IvyTclChannelSetUp((IVY_HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel);
+#if IVYMINOR_VERSION == 8
+  c = IvyChannelAdd((IVY_HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel);
+#else
+  c = IvyChannelAdd((IVY_HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel, cb_write_channel);
+#endif
   return Val_int(c);
 }
 
 value ivy_TclchannelClose(value ch)
 {
-  IvyTclChannelClose((Channel)Int_val(ch));
+  IvyChannelRemove((Channel)Long_val(ch));
   return Val_unit;
 }