1 From 69917d25c6f718572433262d86691bf24e72e4c8 Mon Sep 17 00:00:00 2001
2 From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
3 Date: Wed, 13 Jul 2016 12:02:10 +0900
4 Subject: [PATCH] Fix build with gcc-6
6 Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
8 src/lib/vterm.cpp | 4 ++--
9 src/lib/vterm_states.cpp | 18 +++++++++---------
10 2 files changed, 11 insertions(+), 11 deletions(-)
12 diff --git a/src/lib/vterm.cpp b/src/lib/vterm.cpp
13 index 3a5dcc7..f79f44c 100644
14 --- a/src/lib/vterm.cpp
15 +++ b/src/lib/vterm.cpp
16 @@ -68,13 +68,13 @@ u8 VTerm::control_map[MAX_CONTROL_CODE], VTerm::escape_map[NR_STATES][MAX_ESCAPE
18 void VTerm::init_state()
20 - for (u8 i = 1; control_sequences[i].code != (u16)-1; i++) {
21 + for (u8 i = 1; control_sequences[i].code != (u16)0xFFFF; i++) {
22 control_map[control_sequences[i].code] = i;
26 for (u8 i = 1; ; i++) {
27 - if (escape_sequences[i].code == (u16)-1) {
28 + if (escape_sequences[i].code == (u16)0xFFFF) {
30 if (state == NR_STATES) break;
32 diff --git a/src/lib/vterm_states.cpp b/src/lib/vterm_states.cpp
33 index 49e7588..6aaa8b3 100644
34 --- a/src/lib/vterm_states.cpp
35 +++ b/src/lib/vterm_states.cpp
36 @@ -39,14 +39,14 @@ const VTerm::Sequence VTerm::control_sequences[] = {
39 { 0x9B, 0, ESsquare },
44 const VTerm::Sequence VTerm::escape_sequences[] = {
52 { '[', &VTerm::clear_param, ESsquare },
53 @@ -65,7 +65,7 @@ const VTerm::Sequence VTerm::escape_sequences[] = {
54 { '8', &VTerm::restore_cursor, ESnormal },
55 { '>', &VTerm::keypad_numeric, ESnormal },
56 { '=', &VTerm::keypad_application, ESnormal },
61 { '[', 0, ESfunckey },
62 @@ -104,7 +104,7 @@ const VTerm::Sequence VTerm::escape_sequences[] = {
63 { '`', &VTerm::cursor_position_col, ESnormal },
64 { ']', &VTerm::linux_specific, ESnormal },
65 { '}', &VTerm::fbterm_specific, ESnormal },
70 { '0' | ADDSAME(9), &VTerm::set_palette, ESkeep },
71 @@ -112,25 +112,25 @@ const VTerm::Sequence VTerm::escape_sequences[] = {
72 { 'a' | ADDSAME(5), &VTerm::set_palette, ESkeep },
73 { 'P', &VTerm::begin_set_palette, ESkeep },
74 { 'R', &VTerm::reset_palette, ESnormal },
79 { '@', &VTerm::clear_utf8, ESnormal },
80 { 'G', &VTerm::set_utf8, ESnormal },
81 { '8', &VTerm::set_utf8, ESnormal },
86 { '0', &VTerm::set_charset, ESnormal },
87 { 'B', &VTerm::set_charset, ESnormal },
88 { 'U', &VTerm::set_charset, ESnormal },
89 { 'K', &VTerm::set_charset, ESnormal },
94 { '8', &VTerm::screen_align, ESnormal },