tools: reduce diff noise

[xonotic/netradiant.git] / tools / quake3 / common / inout.c

diff --git a/tools/quake3/common/inout.c b/tools/quake3/common/inout.c
index 6920995fcb8d8838bcfecd6272d60a861155ed70..58d42ed58fcee12321697918c90887b45ff37607 100644 (file)
--- a/tools/quake3/common/inout.c
+++ b/tools/quake3/common/inout.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1999-2006 Id Software, Inc. and contributors.
+   Copyright (C) 1999-2007 id Software, Inc. and contributors.
    For a list of contributors, see the accompanying CONTRIBUTORS file.
 
    This file is part of GtkRadiant.
@@ -26,6 +26,7 @@
 // deal with in/out tasks, for either stdin/stdout or network/XML stream
 //
 
+#include "globaldefs.h"
 #include "cmdlib.h"
 #include "mathlib.h"
 #include "polylib.h"
@@ -33,7 +34,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifdef WIN32
+#if GDEF_OS_WINDOWS
 #include <direct.h>
 #include <windows.h>
 #endif
@@ -43,10 +44,9 @@
 #include "libxml/tree.h"
 
 // utf8 conversion
-#include <glib/gconvert.h>
-#include <glib/gmem.h>
+#include <glib.h>
 
-#ifdef WIN32
+#if GDEF_OS_WINDOWS
 HWND hwndOut = NULL;
 qboolean lookedForServer = qfalse;
 UINT wm_BroadcastCommand = -1;
@@ -152,7 +152,7 @@ void xml_Select( char *msg, int entitynum, int brushnum, qboolean bError ){
        xmlNodeSetContent( node, (xmlChar*)buf );
        level[0] = (int)'0' + ( bError ? SYS_ERR : SYS_WRN )  ;
        level[1] = 0;
-       xmlSetProp( node, (xmlChar*)"level", (xmlChar *)&level );
+       xmlSetProp( node, (xmlChar*)"level", (xmlChar*)&level );
        // a 'select' information
        sprintf( buf, "%i %i", entitynum, brushnum );
        select = xmlNewNode( NULL, (xmlChar*)"brush" );