From: Paul Eggert Date: Sat, 5 Feb 2011 09:57:53 +0000 (-0800) Subject: * charset.c: conform to C89 pointer rules X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~1029^2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dfb6afda103a82da1468af8552d351ab326404ee;p=emacs.git * charset.c: conform to C89 pointer rules (define_charset_internal): Switch between char * and unsigned char *. --- diff --git a/src/ChangeLog b/src/ChangeLog index 8d02825f8ce..48d3983e253 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2011-02-05 Paul Eggert + * charset.c: conform to C89 pointer rules + (define_charset_internal): Switch between char * and unsigned char *. + * xmenu.c: conform to C89 const rules (xmenu_show, xdialog_show): Declare local var as char *, not const char *, to stay compatible with C89 const rules. diff --git a/src/charset.c b/src/charset.c index a6046600194..229f2c2cdae 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1253,12 +1253,13 @@ usage: (define-charset-internal ...) */) static int define_charset_internal (Lisp_Object name, int dimension, - const unsigned char *code_space, + const char *code_space_chars, unsigned min_code, unsigned max_code, int iso_final, int iso_revision, int emacs_mule_id, int ascii_compatible, int supplementary, int code_offset) { + const unsigned char *code_space = (const unsigned char *) code_space_chars; Lisp_Object args[charset_arg_max]; Lisp_Object plist[14]; Lisp_Object val;