From 7f5901d23708206bef5321b5720c2e285fbfac9e Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Sun, 25 Nov 2018 16:27:13 +0100 Subject: [PATCH] Fix compiler warning on non-x86 architectures --- ChangeLog | 1 + src/ftermlinux.cpp | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2a0f4b5..c80a364c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2018-11-25 Markus Gans * Version 0.5.0 * Namespace fix in FTermFreeBSD and FTermOpenBSD + * Fix compiler warning on non-x86 architectures 2018-11-24 Markus Gans * Improved Sun Microsystems workstation console quirks diff --git a/src/ftermlinux.cpp b/src/ftermlinux.cpp index b1f93849..cffef4be 100644 --- a/src/ftermlinux.cpp +++ b/src/ftermlinux.cpp @@ -118,17 +118,20 @@ void FTermLinux::setUTF8 (bool on) } //---------------------------------------------------------------------- +#if defined(__x86_64__) || defined(__i386) || defined(__arm__) bool FTermLinux::setPalette (FColor index, int r, int g, int b) { if ( ! FTerm::isLinuxTerm() ) return false; -#if defined(__x86_64__) || defined(__i386) || defined(__arm__) return setVGAPalette (index, r, g, b); -#else - return false; -#endif } +#else +bool FTermLinux::setPalette (FColor, int, int, int) +{ + return false; +} +#endif //---------------------------------------------------------------------- bool FTermLinux::isLinuxConsole()