This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch experimental/master in repository ocaml.
commit b1ca5e9f0f3f456f0d5826a0792e192c864b9168 Author: Stephane Glondu <st...@glondu.net> Date: Thu Nov 7 16:09:23 2013 +0100 Add const qualifiers in Tcl/Tk bindings --- ...0-Add-const-qualifiers-in-Tcl-Tk-bindings.patch | 85 ++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 86 insertions(+) diff --git a/debian/patches/0010-Add-const-qualifiers-in-Tcl-Tk-bindings.patch b/debian/patches/0010-Add-const-qualifiers-in-Tcl-Tk-bindings.patch new file mode 100644 index 0000000..21dd515 --- /dev/null +++ b/debian/patches/0010-Add-const-qualifiers-in-Tcl-Tk-bindings.patch @@ -0,0 +1,85 @@ +From: Stephane Glondu <st...@glondu.net> +Date: Thu, 7 Nov 2013 15:45:50 +0100 +Subject: Add const qualifiers in Tcl/Tk bindings + +--- + 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 9efbbea..6ee6558 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 9a3d38a..5c6aae0 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 61dbfb2..faaf303 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 +-- diff --git a/debian/patches/series b/debian/patches/series index bfb7eca..ac2d26f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ 0007-Avoid-multiple-declarations-in-generated-.c-files-in.patch 0008-Embed-bytecode-in-C-object-when-using-custom.patch 0009-Fix-typos-and-other-wording-issues.patch +0010-Add-const-qualifiers-in-Tcl-Tk-bindings.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits