diff options
author | Stephen Dolan <mu@netsoc.tcd.ie> | 2013-05-08 19:36:52 +0100 |
---|---|---|
committer | Stephen Dolan <mu@netsoc.tcd.ie> | 2013-05-08 19:37:12 +0100 |
commit | a511d03d85d734b149856289237ae5e2461f6bbe (patch) | |
tree | 7e4a44a2f408a5bcc637a4deebf37855d403c992 | |
parent | 9d245c88c4768444e7e36c88f9ae9976ecdcdec8 (diff) |
Configure whether colour is displayed by default directly in source
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | main.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index b16f403b..c42425d9 100644 --- a/configure.ac +++ b/configure.ac @@ -45,4 +45,3 @@ AC_CONFIG_FILES([Makefile]) AC_OUTPUT -dnl FIXME should disable colour output on windows somehow @@ -74,8 +74,10 @@ static void process(jv value, int flags) { jv_free(result); } else { int dumpopts; -#ifdef JQ_DEFAULT_ENABLE_COLOR - dumpopts = JQ_DEFAULT_ENABLE_COLOR ? JV_PRINT_COLOUR : 0; + /* Disable colour by default on Windows builds as Windows + terminals tend not to display it correctly */ +#ifdef WIN32 + dumpopts = 0; #else dumpopts = isatty(fileno(stdout)) ? JV_PRINT_COLOUR : 0; #endif |