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

[Paul Eggert]

------------------------------------------------------------
revno: 103176 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-02-06 22:18:55 -0800
message:
  Merge: * image.c: conform to C89 pointer rules
modified:
  src/ChangeLog
  src/image.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-07 06:15:32 +0000
+++ b/src/ChangeLog     2011-02-07 06:18:23 +0000
@@ -28,6 +28,7 @@
        * indent.c (compute_motion): Likewise.
        * xfont.c (xfont_decode_coding_xlfd): Likewise.
        * ralloc.c (resize_bloc): Likewise.
+       * image.c (tiff_load): Likewise.
        * xml.c (make_dom, parse_region): Likewise.
        * character.c (strwidth): Make its argument const char *, not const
        unsigned char *, since more callers prefer it that way.  All callers

=== modified file 'src/image.c'
--- a/src/image.c       2011-02-06 08:51:35 +0000
+++ b/src/image.c       2011-02-07 06:18:23 +0000
@@ -6778,7 +6778,7 @@
        }
 
       /* Try to open the image file.  */
-      tiff = fn_TIFFOpen (SDATA (file), "r");
+      tiff = fn_TIFFOpen (SSDATA (file), "r");
       if (tiff == NULL)
        {
          image_error ("Cannot open `%s'", file, Qnil);