aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2009-11-06 10:55:11 +0000
committerEli Zaretskii2009-11-06 10:55:11 +0000
commit323637a270a5c5a4ac93cffd4acbe2d34cbf12e2 (patch)
treea8a6e72252fb7515ca391fe6422a279c15d8edcf /src
parente511451fd3efe787c5be5873376b305140e098ad (diff)
downloademacs-323637a270a5c5a4ac93cffd4acbe2d34cbf12e2.tar.gz
emacs-323637a270a5c5a4ac93cffd4acbe2d34cbf12e2.zip
(make_pure_c_string): Fix last change to avoid compiler warning.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/alloc.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 29387dac5ec..9b4794a2c0b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12009-11-06 Eli Zaretskii <eliz@gnu.org>
2
3 * alloc.c (make_pure_c_string): Fix last change to avoid compiler
4 warning.
5
12009-11-06 Jan Djärv <jan.h.d@swipnet.se> 62009-11-06 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * gtkutil.c (xg_event_is_for_scrollbar): New function (bug#4870). 8 * gtkutil.c (xg_event_is_for_scrollbar): New function (bug#4870).
diff --git a/src/alloc.c b/src/alloc.c
index 97c4c45733d..bb148b37ba3 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4832,7 +4832,7 @@ make_pure_c_string (const char *data)
4832 s = (struct Lisp_String *) pure_alloc (sizeof *s, Lisp_String); 4832 s = (struct Lisp_String *) pure_alloc (sizeof *s, Lisp_String);
4833 s->size = nchars; 4833 s->size = nchars;
4834 s->size_byte = -1; 4834 s->size_byte = -1;
4835 s->data = data; 4835 s->data = (unsigned char *) data;
4836 s->intervals = NULL_INTERVAL; 4836 s->intervals = NULL_INTERVAL;
4837 XSETSTRING (string, s); 4837 XSETSTRING (string, s);
4838 return string; 4838 return string;