From d88df03f3f27531579f2a20ec6a8c8bb9d5ffbf5 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Thu, 7 Nov 2013 15:45:50 +0100 Subject: [PATCH] Add const qualifiers in Tcl/Tk bindings Bug: http://caml.inria.fr/mantis/view.php?id=6230 Gbp-Pq: Name 0010-Add-const-qualifiers-in-Tcl-Tk-bindings.patch --- otherlibs/labltk/support/camltk.h | 4 ++-- otherlibs/labltk/support/cltkCaml.c | 2 +- otherlibs/labltk/support/cltkUtf.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/otherlibs/labltk/support/camltk.h b/otherlibs/labltk/support/camltk.h index 9efbbea3..6ee65584 100644 --- a/otherlibs/labltk/support/camltk.h +++ b/otherlibs/labltk/support/camltk.h @@ -40,7 +40,7 @@ extern char *string_to_c(value s); /* cltkUtf.c */ -extern value tcl_string_to_caml( char * ); +extern value tcl_string_to_caml( CONST84 char * ); extern char * caml_string_to_tcl( value ); /* cltkEval.c */ @@ -53,7 +53,7 @@ extern value *tkerror_exn; extern value *handler_code; extern int CamlCBCmd(ClientData clientdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]); -CAMLTKextern void tk_error(char * errmsg) Noreturn; +CAMLTKextern void tk_error(CONST84 char * errmsg) Noreturn; /* cltkMain.c */ extern int signal_events; diff --git a/otherlibs/labltk/support/cltkCaml.c b/otherlibs/labltk/support/cltkCaml.c index 9a3d38a5..5c6aae08 100644 --- a/otherlibs/labltk/support/cltkCaml.c +++ b/otherlibs/labltk/support/cltkCaml.c @@ -63,7 +63,7 @@ CAMLprim value camltk_return (value v) } /* Note: raise_with_string WILL copy the error message */ -CAMLprim void tk_error(char *errmsg) +CAMLprim void tk_error(CONST84 char *errmsg) { raise_with_string(*tkerror_exn, errmsg); } diff --git a/otherlibs/labltk/support/cltkUtf.c b/otherlibs/labltk/support/cltkUtf.c index 61dbfb2f..faaf3030 100644 --- a/otherlibs/labltk/support/cltkUtf.c +++ b/otherlibs/labltk/support/cltkUtf.c @@ -36,7 +36,7 @@ #ifdef UTFCONVERSION -char *external_to_utf( char *str ){ +char *external_to_utf( CONST84 char *str ){ char *res; Tcl_DString dstr; int length; @@ -50,7 +50,7 @@ char *external_to_utf( char *str ){ return res; } -char *utf_to_external( char *str ){ +char *utf_to_external( CONST84 char *str ){ char *res; Tcl_DString dstr; int length; @@ -69,7 +69,7 @@ char *caml_string_to_tcl( value s ) return external_to_utf( String_val(s) ); } -value tcl_string_to_caml( char *s ) +value tcl_string_to_caml( CONST84 char *s ) { CAMLparam0(); CAMLlocal1(res); @@ -84,6 +84,6 @@ value tcl_string_to_caml( char *s ) #else char *caml_string_to_tcl(value s){ return string_to_c(s); } -value tcl_string_to_caml(char *s){ return copy_string(s); } +value tcl_string_to_caml(CONST84 char *s){ return copy_string(s); } #endif -- 2.30.2