[Emacs-diffs] /srv/bzr/emacs/trunk r103159: Merge: * casefiddle.c: conform to C89 pointer rules

[Paul Eggert]

------------------------------------------------------------
revno: 103159 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-02-06 17:25:30 -0800
message:
  Merge: * casefiddle.c: conform to C89 pointer rules
modified:
  src/ChangeLog
  src/casefiddle.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-07 01:18:31 +0000
+++ b/src/ChangeLog     2011-02-07 01:24:53 +0000
@@ -5,6 +5,7 @@
        * dired.c (scmp, file_name_completion):
        Change types between char * and unsigned char *, to satisfy C89
        rules about pointer type compatibility.
+       * casefiddle.c (casify_object, casify_region): Likewise.
 
 2011-02-06  Paul Eggert  <address@hidden>
 

=== modified file 'src/casefiddle.c'
--- a/src/casefiddle.c  2011-01-26 08:36:39 +0000
+++ b/src/casefiddle.c  2011-02-07 01:24:53 +0000
@@ -142,7 +142,7 @@
          o += CHAR_STRING (c, o);
        }
       eassert (o - dst <= o_size);
-      obj = make_multibyte_string (dst, size, o - dst);
+      obj = make_multibyte_string ((char *) dst, size, o - dst);
       SAFE_FREE ();
       return obj;
     }
@@ -279,7 +279,7 @@
                     keeping text properties the same.  */
                  replace_range_2 (start, start_byte,
                                   start + 1, start_byte + len,
-                                  str, 1, tolen,
+                                  (char *) str, 1, tolen,
                                   0);
                  len = tolen;
                }
@@ -442,4 +442,3 @@
   initial_define_key (meta_map, 'l', "downcase-word");
   initial_define_key (meta_map, 'c', "capitalize-word");
 }
-