X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=conout.c;h=1d34b164842a54731ba3499642f3dba875094e61;hb=4583cb8280dacaf514fcf5f1666663808180eae4;hp=5f8454d910027ca2f74e4a3e79e3afa39f5707e7;hpb=033cf7c7d397c3fdc23a1448b0068000219efef6;p=xonotic%2Fgmqcc.git diff --git a/conout.c b/conout.c index 5f8454d..1d34b16 100644 --- a/conout.c +++ b/conout.c @@ -20,8 +20,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include #include "gmqcc.h" -#include "platform.h" #define GMQCC_IS_STDOUT(X) ((fs_file_t*)((void*)X) == (fs_file_t*)stdout) #define GMQCC_IS_STDERR(X) ((fs_file_t*)((void*)X) == (fs_file_t*)stderr) @@ -49,10 +49,8 @@ static con_t console; * checks. */ static void con_enablecolor(void) { - if (console.handle_err == (fs_file_t*)stderr || console.handle_err == (fs_file_t*)stdout) - console.color_err = !!(platform_isatty(STDERR_FILENO)); - if (console.handle_out == (fs_file_t*)stderr || console.handle_out == (fs_file_t*)stdout) - console.color_out = !!(platform_isatty(STDOUT_FILENO)); + console.color_err = util_isatty(console.handle_err); + console.color_out = util_isatty(console.handle_out); } /* @@ -215,8 +213,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 */ +/* General error interface: TODO seperate as part of the compiler front-end */ size_t compile_errors = 0; size_t compile_warnings = 0; size_t compile_Werrors = 0; @@ -281,4 +278,3 @@ bool GMQCC_WARN compile_warning(lex_ctx_t ctx, int warntype, const char *fmt, .. va_end(ap); return r; } -#endif