Merge from origin/emacs-25

[gnu-emacs] / src / image.c

diff --git a/src/image.c b/src/image.c
index 2a7c2ccc82df672c47f597a62d98742b8e1c71ac..22bbc35fcfbec591fb592f8e30cf44a17ffd6a57 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -7979,7 +7979,8 @@ gif_load (struct frame *f, struct image *img)
        {
          img->lisp_data
            = Fcons (make_number (ext->Function),
-                    Fcons (make_unibyte_string (ext->Bytes, ext->ByteCount),
+                    Fcons (make_unibyte_string ((char *) ext->Bytes,
+                                                ext->ByteCount),
                            img->lisp_data));
          if (ext->Function == GIF_LOCAL_DESCRIPTOR_EXTENSION
              && ext->ByteCount == 4)