martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix C99 incompatibilities in Cairo code

Browse Source 
* src/image.c (xpm_load) [USE_CAIRO]:
* src/xterm.c (x_cr_accumulate_data) [USE_CAIRO]:
Fix pointer signedness problem.
This commit is contained in:
Paul Eggert
2015-06-25 07:08:23 -07:00
parent 659199f2ca
commit 67dbc32afd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/image.c
View File

@@ -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)

2
src/xterm.c
View File

@@ -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;
}