[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103125: Merge: * charset.c: conform
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103125: Merge: * charset.c: conform to C89 pointer rules |
Date: |
Sat, 05 Feb 2011 02:00:31 -0800 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103125 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-05 02:00:31 -0800
message:
Merge: * charset.c: conform to C89 pointer rules
modified:
src/ChangeLog
src/charset.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-02-05 09:49:52 +0000
+++ b/src/ChangeLog 2011-02-05 09:57:53 +0000
@@ -1,5 +1,8 @@
2011-02-05 Paul Eggert <address@hidden>
+ * 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.
=== modified file 'src/charset.c'
--- a/src/charset.c 2011-01-31 07:34:45 +0000
+++ b/src/charset.c 2011-02-05 09:57:53 +0000
@@ -1253,12 +1253,13 @@
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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103125: Merge: * charset.c: conform to C89 pointer rules,
Paul Eggert <=