Some more platform / compiler specific code refactoring.

[xonotic/gmqcc.git] / conout.c

diff --git a/conout.c b/conout.c
index 7fb50b98612d3d5228b89615485f1feb509f1779..f89d68c13ec10b2b71e681f60f007f3f0d0f61bd 100644 (file)
--- a/conout.c
+++ b/conout.c
@@ -198,9 +198,9 @@ static con_t console;
  */
 static void con_enablecolor(void) {
     if (console.handle_err == stderr || console.handle_err == stdout)
-        console.color_err = true; /*!!(isatty(STDERR_FILENO));*/
+        console.color_err = !!(isatty(STDERR_FILENO));
     if (console.handle_out == stderr || console.handle_out == stdout)
-        console.color_out = true; /*!!(isatty(STDOUT_FILENO));*/
+        console.color_out = !!(isatty(STDOUT_FILENO));
 }
 
 /*
@@ -216,11 +216,7 @@ static int con_write(FILE *handle, const char *fmt, va_list va) {
     {
         char data[4096];
         memset(data, 0, sizeof(data));
-#ifdef _MSC_VER
-        vsnprintf_s(data, sizeof(data), sizeof(data), fmt, va);
-#else
-        vsnprintf(data, sizeof(data), fmt, va);
-#endif
+        platform_vsnprintf(data, sizeof(data), fmt, va);
         ln = (GMQCC_IS_DEFINE(handle)) ? win_fputs(handle, data) : fs_file_puts(handle, data);
     }
     #endif
@@ -326,7 +322,6 @@ int con_out(const char *fmt, ...) {
     return   ln;
 }
 
-#ifndef QCVM_EXECUTOR
 /*
  * Utility console message writes for lexer contexts.  These will allow
  * for reporting of file:line based on lexer context, These are used
@@ -379,6 +374,7 @@ void con_cprintmsg(lex_ctx_t ctx, int lvl, const char *msgtype, const char *msg,
     va_end  (va);
 }
 
+#ifndef QCVM_EXECUTOR
 /* General error interface */
 size_t compile_errors   = 0;
 size_t compile_warnings = 0;