Utiliser les includes de ../../../byterun, pas ceux de /usr/local/lib/ocaml/caml.

Ajout d'includes manquants.  Ajout de prototypes sur toutes les fonctions.
Suppression de warnings du compilo C.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3098 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 8 insertions, 14 deletions

diff --git a/otherlibs/labltk/support/cltkWait.c b/otherlibs/labltk/support/cltkWait.c
index dbb5dc866..57028372f 100644
--- a/otherlibs/labltk/support/cltkWait.c
+++ b/otherlibs/labltk/support/cltkWait.c
@@ -17,8 +17,9 @@
 
 #include <tcl.h>
 #include <tk.h>
-#include <caml/mlvalues.h>
-#include <caml/memory.h>
+#include <mlvalues.h>
+#include <memory.h>
+#include <callback.h>
 #include "camltk.h"
 
 /* The following are replacements for 
@@ -42,9 +43,8 @@ struct WinCBData {
   Tk_Window win;
 };
 
-static void WaitVisibilityProc(clientData, eventPtr)
-    ClientData clientData;      
-    XEvent *eventPtr;           /* Information about event (not used). */
+static void WaitVisibilityProc(ClientData clientData, XEvent *eventPtr)
+                                /* Information about event (not used). */
 {
   struct WinCBData *vis = clientData;
   value cbid = Val_int(vis->cbid);
@@ -57,9 +57,7 @@ static void WaitVisibilityProc(clientData, eventPtr)
 }
 
 /* Sets up a callback upon Visibility of a window */
-value camltk_wait_vis(win,cbid) /* ML */
-     value win;
-     value cbid;
+value camltk_wait_vis(value win, value cbid) /* ML */
 {
   struct WinCBData *vis =
     (struct WinCBData *)stat_alloc(sizeof(struct WinCBData));
@@ -74,9 +72,7 @@ value camltk_wait_vis(win,cbid) /* ML */
   return Val_unit;
 }
 
-static void WaitWindowProc(clientData, eventPtr)
-    ClientData clientData;      
-    XEvent *eventPtr;           
+static void WaitWindowProc(ClientData clientData, XEvent *eventPtr)
 {
   if (eventPtr->type == DestroyNotify) {
     struct WinCBData *vis = clientData;
@@ -88,9 +84,7 @@ static void WaitWindowProc(clientData, eventPtr)
 }
 
 /* Sets up a callback upon window destruction */
-value camltk_wait_des(win,cbid) /* ML */
-     value win;
-     value cbid;
+value camltk_wait_des(value win, value cbid) /* ML */
 {
   struct WinCBData *vis =
     (struct WinCBData *)stat_alloc(sizeof(struct WinCBData));