diff options
author | Benedikt Meurer <benedikt.meurer@googlemail.com> | 2012-02-05 09:20:46 +0000 |
---|---|---|
committer | Benedikt Meurer <benedikt.meurer@googlemail.com> | 2012-02-05 09:20:46 +0000 |
commit | d0f04172e747ddf84f88ea8a126357664412d574 (patch) | |
tree | c268b49ebb311d5feda21af22c9591c6b326ed29 /otherlibs/labltk/support/cltkEval.c | |
parent | e76218f17d50cb2d8d3f0fcf502c23bb5325fd30 (diff) |
Fix various compiler warnings in labltk.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12126 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/labltk/support/cltkEval.c')
-rw-r--r-- | otherlibs/labltk/support/cltkEval.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/otherlibs/labltk/support/cltkEval.c b/otherlibs/labltk/support/cltkEval.c index 282d2f44c..9ec3f1476 100644 --- a/otherlibs/labltk/support/cltkEval.c +++ b/otherlibs/labltk/support/cltkEval.c @@ -142,7 +142,7 @@ int fill_args (char **argv, int where, value v) tmpargv = (char **)stat_alloc((size + 1) * sizeof(char *)); fill_args(tmpargv,0,Field(v,0)); tmpargv[size] = NULL; - merged = Tcl_Merge(size,tmpargv); + merged = Tcl_Merge(size,(const char *const*)tmpargv); for(i = 0; i<size; i++){ stat_free(tmpargv[i]); } stat_free((char *)tmpargv); /* must be freed by stat_free */ @@ -207,17 +207,17 @@ CAMLprim value camltk_tcl_direct_eval(value v) result = Tcl_Eval(cltclinterp, Tcl_DStringValue(&buf)); Tcl_DStringFree(&buf); } else { - result = (*info.proc)(info.clientData,cltclinterp,size,argv); + result = (*info.proc)(info.clientData,cltclinterp,size,(const char**)argv); } #else - result = (*info.proc)(info.clientData,cltclinterp,size,argv); + result = (*info.proc)(info.clientData,cltclinterp,size,(const char**)argv); #endif } else { /* implement the autoload stuff */ if (Tcl_GetCommandInfo(cltclinterp,"unknown",&info)) { /* unknown found */ for (i = size; i >= 0; i--) argv[i+1] = argv[i]; argv[0] = "unknown"; - result = (*info.proc)(info.clientData,cltclinterp,size+1,argv); + result = (*info.proc)(info.clientData,cltclinterp,size+1,(const char**)argv); } else { /* ah, it isn't there at all */ result = TCL_ERROR; Tcl_AppendResult(cltclinterp, "Unknown command \"", |