Merge branch 'NateEag-master-patch-12920' into 'master'

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

diff --git a/tools/quake3/common/inout.h b/tools/quake3/common/inout.h
index 4efe0dacb05953cf6b8cfe838ea42f75ba5ffb2e..a4d7f38bf64c6c1bad6260012f13097beb62f87c 100644 (file)
--- a/tools/quake3/common/inout.h
+++ b/tools/quake3/common/inout.h
@@ -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.
@@ -22,6 +22,7 @@
 #ifndef __INOUT__
 #define __INOUT__
 
+#include "globaldefs.h"
 // inout is the only stuff relying on xml, include the headers there
 #include "libxml/tree.h"
 #include "mathlib.h"
@@ -48,10 +49,11 @@ void Broadcast_Shutdown();
 #define SYS_NOXML 4 // don't send that down the XML stream
 
 extern qboolean verbose;
+extern qboolean werror;
 void Sys_Printf( const char *text, ... );
 void Sys_FPrintf( int flag, const char *text, ... );
 
-#ifdef _DEBUG
+#if GDEF_DEBUG
 #define DBG_XML 1
 #endif