diff options
| author | Pierre Weis <Pierre.Weis@inria.fr> | 2008-07-01 09:55:52 +0000 |
|---|---|---|
| committer | Pierre Weis <Pierre.Weis@inria.fr> | 2008-07-01 09:55:52 +0000 |
| commit | 10b38811b6fdd4d37ad8fd93f17f58cb2884cd0e (patch) | |
| tree | 8d3cd452522295bbf1f5f1b0d34648a4e43d9064 /otherlibs/labltk/support/cltkCaml.c | |
| parent | 5abe61a5ade8c30c3c634748b2346ac88f3a8055 (diff) | |
Support for tk8.5: correcting tk_incs.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8899 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/labltk/support/cltkCaml.c')
| -rw-r--r-- | otherlibs/labltk/support/cltkCaml.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/otherlibs/labltk/support/cltkCaml.c b/otherlibs/labltk/support/cltkCaml.c index 976c864ef..4bb65f418 100644 --- a/otherlibs/labltk/support/cltkCaml.c +++ b/otherlibs/labltk/support/cltkCaml.c @@ -28,7 +28,11 @@ value * tkerror_exn = NULL; value * handler_code = NULL; /* The Tcl command for evaluating callback in Caml */ +#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8) +int CamlCBCmd(ClientData clientdata, Tcl_Interp *interp, int argc, CONST84 char **argv) +#else int CamlCBCmd(ClientData clientdata, Tcl_Interp *interp, int argc, char **argv) +#endif { CheckInit(); @@ -38,7 +42,7 @@ int CamlCBCmd(ClientData clientdata, Tcl_Interp *interp, int argc, char **argv) int id; if (Tcl_GetInt(interp, argv[1], &id) != TCL_OK) return TCL_ERROR; - callback2(*handler_code,Val_int(id),copy_string_list(argc - 2,&argv[2])); + callback2(*handler_code,Val_int(id),copy_string_list(argc - 2,(char **)&argv[2])); /* Never fails (Caml would have raised an exception) */ /* but result may have been set by callback */ return TCL_OK; |