[Emacs-diffs] master 67dbc32: Fix C99 incompatibilities in Cairo code

[Paul Eggert]

branch: master
commit 67dbc32afd8af2eaca9fdba9f17680cdcecb178f
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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.
---
 src/image.c |    2 +-
 src/xterm.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/image.c b/src/image.c
index dfa8941..cf96cae 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 d573738..b7aacfa 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;
 }