diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2008-09-26 07:35:24 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2008-09-26 07:35:24 +0000 |
| commit | ff88bbc5754f601d897c37fc5e9122cdad112078 (patch) | |
| tree | 1ef73495b393987daa248d72472985d42744d8b7 /otherlibs/labltk/support/cltkCaml.c | |
| parent | 7b822718b831aec9669aaceba535e7e98a06e988 (diff) | |
fix PR#4614
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9036 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/labltk/support/cltkCaml.c')
| -rw-r--r-- | otherlibs/labltk/support/cltkCaml.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/otherlibs/labltk/support/cltkCaml.c b/otherlibs/labltk/support/cltkCaml.c index 4bb65f418..c9bcc80dc 100644 --- a/otherlibs/labltk/support/cltkCaml.c +++ b/otherlibs/labltk/support/cltkCaml.c @@ -28,11 +28,8 @@ 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 +int CamlCBCmd(ClientData clientdata, Tcl_Interp *interp, + int argc, CONST84 char **argv) { CheckInit(); @@ -42,7 +39,8 @@ 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,(char **)&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; |