[paparazzi-commits] [6428] update ocaml-ivy for 64 bit

[Eric]

Revision: 6428
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6428
Author:   lamestllama
Date:     2010-11-19 12:24:15 +0000 (Fri, 19 Nov 2010)
Log Message:
-----------
update ocaml-ivy for 64 bit

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

Modified: paparazzi-software/trunk/sw/lib/ocaml/ivy/cglibivy.c
===================================================================
--- paparazzi-software/trunk/sw/lib/ocaml/ivy/cglibivy.c        2010-11-19 
11:33:22 UTC (rev 6427)
+++ paparazzi-software/trunk/sw/lib/ocaml/ivy/cglibivy.c        2010-11-19 
12:24:15 UTC (rev 6428)
@@ -38,6 +38,6 @@
 
 value ivy_GtkchannelClose(value ch)
 {
-  IvyChannelRemove((Channel)Int_val(ch));
+  IvyChannelRemove((Channel)Long_val(ch));
   return Val_unit;
 }

Modified: paparazzi-software/trunk/sw/lib/ocaml/ivy/civy.c
===================================================================
--- paparazzi-software/trunk/sw/lib/ocaml/ivy/civy.c    2010-11-19 11:33:22 UTC 
(rev 6427)
+++ paparazzi-software/trunk/sw/lib/ocaml/ivy/civy.c    2010-11-19 12:24:15 UTC 
(rev 6428)
@@ -54,29 +54,29 @@
   /* Copie de argv dans t avec ajout d'un pointeur nul a la fin */
   for(i=0; i < argc; i++) t[i] = argv[i];
   t[argc] = (char*)0L;
-  callback2(*(value*)closure, Val_int((int)app), copy_string_array((char const 
**)t));
+  callback2(*(value*)closure, Val_long(app), copy_string_array((char const 
**)t));
 }
 
 value ivy_bindMsg(value cb_name, value regexp)
 {
   value * closure = caml_named_value(String_val(cb_name));
   MsgRcvPtr id = IvyBindMsg(ClosureCallback, (void*)closure, 
String_val(regexp));
-  return Val_int((int)id);
+  return Val_long(id);
 }
 
 value ivy_unbindMsg(value id)
 {
-  IvyUnbindMsg((MsgRcvPtr)Int_val(id));
+  IvyUnbindMsg((MsgRcvPtr)Long_val(id));
   return Val_unit;
 }
 
 value ivy_name_of_client(value c)
 {
-  return copy_string(IvyGetApplicationName((IvyClientPtr)Int_val(c)));
+  return copy_string(IvyGetApplicationName((IvyClientPtr)Long_val(c)));
 }
 value ivy_host_of_client(value c)
 {
-  return copy_string(IvyGetApplicationHost((IvyClientPtr)Int_val(c)));
+  return copy_string(IvyGetApplicationHost((IvyClientPtr)Long_val(c)));        
 }
 
 void cb_delete_channel(void *delete_read)

Modified: paparazzi-software/trunk/sw/lib/ocaml/ivy/civyloop.c
===================================================================
--- paparazzi-software/trunk/sw/lib/ocaml/ivy/civyloop.c        2010-11-19 
11:33:22 UTC (rev 6427)
+++ paparazzi-software/trunk/sw/lib/ocaml/ivy/civyloop.c        2010-11-19 
12:24:15 UTC (rev 6428)
@@ -25,7 +25,7 @@
 void timer_cb(TimerId id, void *data, unsigned long delta)
 {
   value closure = *(value*)data;
-  callback(closure, Val_int((int) id));
+  callback(closure, Val_long((int) id));       
 }
 
 value ivy_timerRepeatafter(value nb_ticks,value delay, value closure_name)
@@ -58,13 +58,13 @@
 
 value ivy_timerRemove(value t)
 {
-  TimerRemove((TimerId)Int_val(t));
+  TimerRemove((TimerId)Long_val(t));
   return Val_unit;
 }
 
 
 value ivy_channelClose(value ch)
 {
-  IvyChannelRemove((Channel)Int_val(ch));
+  IvyChannelRemove((Channel)Long_val(ch));
   return Val_unit;
 }