aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-06-25 07:08:23 -0700
committerPaul Eggert2015-06-25 07:09:04 -0700
commit67dbc32afd8af2eaca9fdba9f17680cdcecb178f (patch)
tree6f6a13f6420f54414b9d23eee7b273e2d095d56a
parent659199f2ca5f283fb246faa78a244e5ca25f53dd (diff)
downloademacs-67dbc32afd8af2eaca9fdba9f17680cdcecb178f.tar.gz
emacs-67dbc32afd8af2eaca9fdba9f17680cdcecb178f.zip
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.
-rw-r--r--src/image.c2
-rw-r--r--src/xterm.c2
2 files changed, 2 insertions, 2 deletions
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)
3690 int i; 3690 int i;
3691 uint32_t *od = (uint32_t *)data; 3691 uint32_t *od = (uint32_t *)data;
3692 uint32_t *id = (uint32_t *)img->ximg->data; 3692 uint32_t *id = (uint32_t *)img->ximg->data;
3693 unsigned char *mid = img->mask_img ? img->mask_img->data : 0; 3693 char *mid = img->mask_img ? img->mask_img->data : 0;
3694 uint32_t bgcolor = get_spec_bg_or_alpha_as_argb (img, f); 3694 uint32_t bgcolor = get_spec_bg_or_alpha_as_argb (img, f);
3695 3695
3696 for (i = 0; i < height; ++i) 3696 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,
552{ 552{
553 Lisp_Object *acc = (Lisp_Object *) closure; 553 Lisp_Object *acc = (Lisp_Object *) closure;
554 554
555 *acc = Fcons (make_unibyte_string (data, length), *acc); 555 *acc = Fcons (make_unibyte_string ((char const *) data, length), *acc);
556 556
557 return CAIRO_STATUS_SUCCESS; 557 return CAIRO_STATUS_SUCCESS;
558} 558}