[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103174: Merge: * ralloc.c: conform t
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103174: Merge: * ralloc.c: conform to C89 pointer rules |
Date: |
Sun, 06 Feb 2011 21:48:19 -0800 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103174 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-02-06 21:48:19 -0800
message:
Merge: * ralloc.c: conform to C89 pointer rules
modified:
src/ChangeLog
src/ralloc.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-02-07 05:44:50 +0000
+++ b/src/ChangeLog 2011-02-07 05:47:56 +0000
@@ -27,6 +27,7 @@
* doprnt.c (doprnt): Likewise.
* indent.c (compute_motion): Likewise.
* xfont.c (xfont_decode_coding_xlfd): Likewise.
+ * ralloc.c (resize_bloc): 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/ralloc.c'
--- a/src/ralloc.c 2011-01-25 04:08:28 +0000
+++ b/src/ralloc.c 2011-02-07 05:47:56 +0000
@@ -648,7 +648,7 @@
else
{
memmove (bloc->new_data, bloc->data, old_size);
- memset (bloc->new_data + old_size, 0, size - old_size);
+ memset ((char *) bloc->new_data + old_size, 0, size - old_size);
*bloc->variable = bloc->data = bloc->new_data;
}
}
@@ -1259,4 +1259,3 @@
use_relocatable_buffers = 1;
}
-
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103174: Merge: * ralloc.c: conform to C89 pointer rules,
Paul Eggert <=