Merge from origin/emacs-25

5a952eb Don't mention ~/.emacs.bmk literally in doc strings
c338cf3 * etc/NEWS: Explain why multicolor font display is disabled o...
c30d1b4 Port to Ubuntu 16.04 --enable-gcc-warnings

1 files changed, 2 insertions, 1 deletions

diff --git a/src/image.c b/src/image.c
index 2a7c2ccc82d..22bbc35fcfb 100644
--- 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)