Merge branch 'master' into diagnostics

[xonotic/gmqcc.git] / conout.c

diff --git a/conout.c b/conout.c
index 687fdf499a9e590af16c6c90a4006187b3ca5b4f..b3380ec2f63c7fc505f0222680fded991232d4ee 100644 (file)
--- a/conout.c
+++ b/conout.c
@@ -21,7 +21,6 @@
  * SOFTWARE.
  */
 #include "gmqcc.h"
-#include <stdio.h>
 
 /*
  * isatty/STDERR_FILENO/STDOUT_FILNO
@@ -198,7 +197,7 @@ static con_t console;
  * NOTE: This prevents colored output to piped stdout/err via isatty
  * checks.
  */
-static void con_enablecolor() {
+static void con_enablecolor(void) {
     if (console.handle_err == stderr || console.handle_err == stdout)
         console.color_err = !!(isatty(STDERR_FILENO));
     if (console.handle_out == stderr || console.handle_out == stdout)
@@ -249,6 +248,9 @@ void con_color(int state) {
     }
 }
 
+bool con_color_err() { return !!console.color_err; }
+bool con_color_out() { return !!console.color_out; }
+
 void con_init() {
     console.handle_err = stderr;
     console.handle_out = stdout;