maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-470: Fix incompatible pointer type warning under older GCC.

Browse Source 
Older versions of GCC (prior to 5.1) emits an "incompatible pointer
type" warning when passing `foo(*)[]` as `const foo(*)[]`. This was
changed in GCC 5.1, and this patch adds explicit casts to remove the
warning under older GCC.
This commit is contained in:
Jim Chen 2018-05-27 23:45:56 -04:00
parent 6da9236ffd
commit 9c10ddae3b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/terminal/terminal.c
View File

@ -495,7 +495,8 @@ static void guac_terminal_parse_color_scheme(guac_client* client,
return; /* Parsing failed. */ return; /* Parsing failed. */
if (guac_terminal_parse_color_scheme_value( if (guac_terminal_parse_color_scheme_value(
client, name_end + 1, pair_end, palette, color_target)) client, name_end + 1, pair_end,
(const guac_terminal_color(*)[256]) palette, color_target))
return; /* Parsing failed. */ return; /* Parsing failed. */
} }
} }
@ -566,7 +567,7 @@ guac_terminal* guac_terminal_create(guac_client* client,
font_name, font_size, dpi, font_name, font_size, dpi,
&default_char.attributes.foreground, &default_char.attributes.foreground,
&default_char.attributes.background, &default_char.attributes.background,
default_palette); (const guac_terminal_color(*)[256]) default_palette);
/* Fail if display init failed */ /* Fail if display init failed */
if (term->display == NULL) { if (term->display == NULL) {