aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorPaul Eggert2011-02-06 18:05:30 -0800
committerPaul Eggert2011-02-06 18:05:30 -0800
commit902568414670901f4038df6f5431b0de37028f95 (patch)
tree917da998a433150974444ff6412896c6d834972d /src/alloc.c
parenta7e979a44ee01dcca3e5081fe672427395494aa0 (diff)
downloademacs-902568414670901f4038df6f5431b0de37028f95.tar.gz
emacs-902568414670901f4038df6f5431b0de37028f95.zip
* alloc.c: conform to C89 pointer rules
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 67d34d25642..f75903aab5a 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2281,7 +2281,8 @@ make_string (const char *contents, EMACS_INT nbytes)
2281 register Lisp_Object val; 2281 register Lisp_Object val;
2282 EMACS_INT nchars, multibyte_nbytes; 2282 EMACS_INT nchars, multibyte_nbytes;
2283 2283
2284 parse_str_as_multibyte (contents, nbytes, &nchars, &multibyte_nbytes); 2284 parse_str_as_multibyte ((const unsigned char *) contents, nbytes,
2285 &nchars, &multibyte_nbytes);
2285 if (nbytes == nchars || nbytes != multibyte_nbytes) 2286 if (nbytes == nchars || nbytes != multibyte_nbytes)
2286 /* CONTENTS contains no multibyte sequences or contains an invalid 2287 /* CONTENTS contains no multibyte sequences or contains an invalid
2287 multibyte sequence. We must make unibyte string. */ 2288 multibyte sequence. We must make unibyte string. */
@@ -2349,7 +2350,8 @@ make_specified_string (const char *contents,
2349 if (nchars < 0) 2350 if (nchars < 0)
2350 { 2351 {
2351 if (multibyte) 2352 if (multibyte)
2352 nchars = multibyte_chars_in_text (contents, nbytes); 2353 nchars = multibyte_chars_in_text ((const unsigned char *) contents,
2354 nbytes);
2353 else 2355 else
2354 nchars = nbytes; 2356 nchars = nbytes;
2355 } 2357 }
@@ -4650,7 +4652,7 @@ make_pure_string (const char *data,
4650 struct Lisp_String *s; 4652 struct Lisp_String *s;
4651 4653
4652 s = (struct Lisp_String *) pure_alloc (sizeof *s, Lisp_String); 4654 s = (struct Lisp_String *) pure_alloc (sizeof *s, Lisp_String);
4653 s->data = find_string_data_in_pure (data, nbytes); 4655 s->data = (unsigned char *) find_string_data_in_pure (data, nbytes);
4654 if (s->data == NULL) 4656 if (s->data == NULL)
4655 { 4657 {
4656 s->data = (unsigned char *) pure_alloc (nbytes + 1, -1); 4658 s->data = (unsigned char *) pure_alloc (nbytes + 1, -1);