From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 25 Jun 2015 14:08:23 +0000 (-0700)
Subject: Fix C99 incompatibilities in Cairo code
X-Git-Tag: emacs-25.0.90~1644
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=67dbc32afd8af2eaca9fdba9f17680cdcecb178f;p=emacs.git

Fix C99 incompatibilities in Cairo code

* src/image.c (xpm_load) [USE_CAIRO]:
* src/xterm.c (x_cr_accumulate_data) [USE_CAIRO]:
Fix pointer signedness problem.
---

diff --git a/src/image.c b/src/image.c
index dfa8941ab3c..cf96cae0385 100644
--- a/src/image.c
+++ b/src/image.c
@@ -3690,7 +3690,7 @@ xpm_load (struct frame *f, struct image *img)
       int i;
       uint32_t *od = (uint32_t *)data;
       uint32_t *id = (uint32_t *)img->ximg->data;
-      unsigned char *mid = img->mask_img ? img->mask_img->data : 0;
+      char *mid = img->mask_img ? img->mask_img->data : 0;
       uint32_t bgcolor = get_spec_bg_or_alpha_as_argb (img, f);
 
       for (i = 0; i < height; ++i)
diff --git a/src/xterm.c b/src/xterm.c
index d573738754a..b7aacfa8dca 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -552,7 +552,7 @@ x_cr_accumulate_data (void *closure, const unsigned char *data,
 {
   Lisp_Object *acc = (Lisp_Object *) closure;
 
-  *acc = Fcons (make_unibyte_string (data, length), *acc);
+  *acc = Fcons (make_unibyte_string ((char const *) data, length), *acc);
 
   return CAIRO_STATUS_SUCCESS;
 }