Repository: guacamole-server Updated Branches: refs/heads/master 526152b9c -> 21f54b9e1
GUACAMOLE-470: Fix incompatible pointer type warning under older GCC. 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. Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/9c10ddae Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/9c10ddae Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/9c10ddae Branch: refs/heads/master Commit: 9c10ddae3b976d1a524de03e612512ebf2991ea7 Parents: 6da9236 Author: Jim Chen <[email protected]> Authored: Sun May 27 23:45:56 2018 -0400 Committer: Jim Chen <[email protected]> Committed: Sun May 27 23:46:16 2018 -0400 ---------------------------------------------------------------------- src/terminal/terminal.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/9c10ddae/src/terminal/terminal.c ---------------------------------------------------------------------- diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c index 7096add..5ae2ee3 100644 --- a/src/terminal/terminal.c +++ b/src/terminal/terminal.c @@ -495,7 +495,8 @@ static void guac_terminal_parse_color_scheme(guac_client* client, return; /* Parsing failed. */ 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. */ } } @@ -566,7 +567,7 @@ guac_terminal* guac_terminal_create(guac_client* client, font_name, font_size, dpi, &default_char.attributes.foreground, &default_char.attributes.background, - default_palette); + (const guac_terminal_color(*)[256]) default_palette); /* Fail if display init failed */ if (term->display == NULL) {
