From cecf08ac976debda2606f24bb96913dc2f7eb5ed Mon Sep 17 00:00:00 2001
From: Martin Pulec <pulec@cesnet.cz>
Date: Tue, 14 Jul 2015 17:15:29 +0200
Subject: [PATCH] Various fixes

---
 src/debug.cpp     | 2 +-
 src/host.cpp      | 2 +-
 src/video_codec.h | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/debug.cpp b/src/debug.cpp
index d3f3e3894..5da1abc45 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -77,7 +77,7 @@ void log_msg(int level, const char *format, ...)
                 return;
         }
 
-#ifdef WIN32
+#if 0 // WIN32
         if (log_level == LOG_LEVEL_DEBUG) {
                 char msg[65535];
                 va_list ap;
diff --git a/src/host.cpp b/src/host.cpp
index 887efb353..a701741df 100644
--- a/src/host.cpp
+++ b/src/host.cpp
@@ -32,7 +32,7 @@ char *export_dir = NULL;
 volatile bool should_exit_receiver = false;
 
 volatile int log_level = LOG_LEVEL_INFO;
-bool color_term = (strcmp(getenv("TERM"), "xterm") == 0 || strcmp(getenv("TERM"), "xterm-256color") == 0) && isatty(1) && isatty(2);
+bool color_term = (getenv("TERM") && (strcmp(getenv("TERM"), "xterm") == 0 || strcmp(getenv("TERM"), "xterm-256color") == 0 || strcmp(getenv("TERM"), "screen") == 0)) && isatty(1) && isatty(2);
 
 bool ldgm_device_gpu = false;
 
diff --git a/src/video_codec.h b/src/video_codec.h
index 59ea3507c..65a02080b 100644
--- a/src/video_codec.h
+++ b/src/video_codec.h
@@ -80,7 +80,6 @@ codec_t          get_codec_from_name(const char *name) __attribute__((pure));
 const char      *get_codec_file_extension(codec_t codec) __attribute__((pure));
 decoder_t        get_decoder_from_to(codec_t in, codec_t out, bool slow) __attribute__((pure));
 
-uint32_t get_fcc_from_codec(codec_t codec) __attribute__((pure));
 int get_aligned_length(int width, codec_t codec) __attribute__((pure));
 int get_pf_block_size(codec_t codec) __attribute__((pure));
 int vc_get_linesize(unsigned int width, codec_t codec) __attribute__((pure));