summaryrefslogtreecommitdiffstats
path: root/display/fbterm/0001-fix-compilation-with-gcc-7.patch
diff options
context:
space:
mode:
Diffstat (limited to 'display/fbterm/0001-fix-compilation-with-gcc-7.patch')
-rw-r--r--display/fbterm/0001-fix-compilation-with-gcc-7.patch82
1 files changed, 82 insertions, 0 deletions
diff --git a/display/fbterm/0001-fix-compilation-with-gcc-7.patch b/display/fbterm/0001-fix-compilation-with-gcc-7.patch
new file mode 100644
index 0000000000..b699dbdd97
--- /dev/null
+++ b/display/fbterm/0001-fix-compilation-with-gcc-7.patch
@@ -0,0 +1,82 @@
+From 97e4cd15a9f56d0606f80bcb234a7d13cc870661 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+Date: Fri, 30 Mar 2018 23:05:34 +0200
+Subject: [PATCH] fix compilation with gcc 7
+
+---
+ src/lib/vterm_states.cpp | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/lib/vterm_states.cpp b/src/lib/vterm_states.cpp
+index 49e7588..ecaf8fe 100644
+--- a/src/lib/vterm_states.cpp
++++ b/src/lib/vterm_states.cpp
+@@ -39,14 +39,14 @@ const VTerm::Sequence VTerm::control_sequences[] = {
+ { 0x1B, 0, ESesc },
+ { 0x7F, 0, ESkeep },
+ { 0x9B, 0, ESsquare },
+- { -1}
++ { static_cast< u16 >(-1) }
+ };
+
+ const VTerm::Sequence VTerm::escape_sequences[] = {
+ { 0, 0, ESnormal },
+
+ // ESnormal
+- { -1 },
++ { static_cast< u16 >(-1) },
+
+ // ESesc
+ { '[', &VTerm::clear_param, ESsquare },
+@@ -65,7 +65,7 @@ const VTerm::Sequence VTerm::escape_sequences[] = {
+ { '8', &VTerm::restore_cursor, ESnormal },
+ { '>', &VTerm::keypad_numeric, ESnormal },
+ { '=', &VTerm::keypad_application, ESnormal },
+- { -1 },
++ { static_cast< u16 >(-1) },
+
+ // ESsquare
+ { '[', 0, ESfunckey },
+@@ -104,7 +104,7 @@ const VTerm::Sequence VTerm::escape_sequences[] = {
+ { '`', &VTerm::cursor_position_col, ESnormal },
+ { ']', &VTerm::linux_specific, ESnormal },
+ { '}', &VTerm::fbterm_specific, ESnormal },
+- { -1 },
++ { static_cast< u16 >(-1) },
+
+ // ESnonstd
+ { '0' | ADDSAME(9), &VTerm::set_palette, ESkeep },
+@@ -112,25 +112,25 @@ const VTerm::Sequence VTerm::escape_sequences[] = {
+ { 'a' | ADDSAME(5), &VTerm::set_palette, ESkeep },
+ { 'P', &VTerm::begin_set_palette, ESkeep },
+ { 'R', &VTerm::reset_palette, ESnormal },
+- { -1 },
++ { static_cast< u16 >(-1) },
+
+ // ESpercent
+ { '@', &VTerm::clear_utf8, ESnormal },
+ { 'G', &VTerm::set_utf8, ESnormal },
+ { '8', &VTerm::set_utf8, ESnormal },
+- { -1 },
++ { static_cast< u16 >(-1) },
+
+ // EScharset
+ { '0', &VTerm::set_charset, ESnormal },
+ { 'B', &VTerm::set_charset, ESnormal },
+ { 'U', &VTerm::set_charset, ESnormal },
+ { 'K', &VTerm::set_charset, ESnormal },
+- { -1 },
++ { static_cast< u16 >(-1) },
+
+ // EShash
+ { '8', &VTerm::screen_align, ESnormal },
+- { -1 },
++ { static_cast< u16 >(-1) },
+
+ // ESfunckey
+- { -1 },
++ { static_cast< u16 >(-1) },
+ };
+--
+2.16.3
+