summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2020-06-02 16:44:22 -0400
committerNat Goodspeed <nat@lindenlab.com>2020-07-01 13:38:05 -0400
commitd8649dbb8a5a20753248923a25c13f729cadd99a (patch)
treece368192ae64e5b6922d865f41747bb99f6f0cdd /indra/llcommon
parent4708662091760f90a7782b726a5a7d89f376ce53 (diff)
SL-13361: Enable color processing on Windows 10 debug console.
(cherry picked from commit 0b61150e698537a7e42a4cdae02496da500399d9)
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llerror.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 41c4ddc725..411412c883 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -40,6 +40,8 @@
# include <syslog.h>
# include <unistd.h>
# include <sys/stat.h>
+#else
+# include <io.h>
#endif // !LL_WINDOWS
#include <vector>
#include "string.h"
@@ -236,14 +238,11 @@ namespace {
static bool checkANSI(void)
{
-#if LL_LINUX || LL_DARWIN
// Check whether it's okay to use ANSI; if stderr is
// a tty then we assume yes. Can be turned off with
// the LL_NO_ANSI_COLOR env var.
return (0 != isatty(2)) &&
(NULL == getenv("LL_NO_ANSI_COLOR"));
-#endif // LL_LINUX
- return FALSE; // works in a cygwin shell... ;)
}
};