[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103173: Merge: * xfont.c: conform to
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103173: Merge: * xfont.c: conform to C89 pointer rules |
Date: |
Sun, 06 Feb 2011 21:45:11 -0800 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103173 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-02-06 21:45:11 -0800
message:
Merge: * xfont.c: conform to C89 pointer rules
modified:
src/ChangeLog
src/xfont.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-02-07 05:42:15 +0000
+++ b/src/ChangeLog 2011-02-07 05:44:50 +0000
@@ -26,6 +26,7 @@
* callproc.c (Fcall_process): Likewise.
* doprnt.c (doprnt): Likewise.
* indent.c (compute_motion): Likewise.
+ * xfont.c (xfont_decode_coding_xlfd): Likewise.
* character.c (strwidth): Make its argument const char *, not const
unsigned char *, since more callers prefer it that way. All callers
changed.
=== modified file 'src/xfont.c'
--- a/src/xfont.c 2011-02-05 10:20:15 +0000
+++ b/src/xfont.c 2011-02-07 05:44:50 +0000
@@ -182,7 +182,7 @@
while (*p0)
{
c = *(unsigned char *) p0++;
- p1 += CHAR_STRING (c, p1);
+ p1 += CHAR_STRING (c, (unsigned char *) p1);
if (--len == 0)
break;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103173: Merge: * xfont.c: conform to C89 pointer rules,
Paul Eggert <=