From: Thomas Debesse <dev@illwieckz.net>
Date: Tue, 12 Feb 2019 00:47:38 +0000 (+0100)
Subject: Garux: renamed disable defines
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b243946c9ffd022cd5d82f2cf474ebfb125929b9;p=xonotic%2Fnetradiant.git

Garux: renamed disable defines
---

diff --git a/libs/stringio.h b/libs/stringio.h
index 7d192a2a..f8814ba8 100644
--- a/libs/stringio.h
+++ b/libs/stringio.h
@@ -232,8 +232,8 @@ inline bool Tokeniser_getFloat( Tokeniser& tokeniser, float& f ){
 	if ( token != 0 && string_parse_float( token, f ) ) {
 		return true;
 	}
-	#define DISABLE_QNAN_FALLBACK
-	#ifndef DISABLE_QNAN_FALLBACK
+	#define GARUX_DISABLE_QNAN_FALLBACK
+	#ifndef GARUX_DISABLE_QNAN_FALLBACK
 	//fallback for 1.#IND 1.#INF 1.#QNAN cases, happening sometimes after rotating & often scaling with tex lock in BP mode
 	else if ( token != 0 && strstr( token, ".#" ) ) {
 		globalErrorStream() << "Warning: " << Unsigned( tokeniser.getLine() ) << ":" << Unsigned( tokeniser.getColumn() ) << ": expected parse problem at '" << token << "': wanted '#number'\nProcessing anyway\n";
diff --git a/tools/quake3/common/vfs.c b/tools/quake3/common/vfs.c
index d26e2249..48a1f86f 100644
--- a/tools/quake3/common/vfs.c
+++ b/tools/quake3/common/vfs.c
@@ -52,8 +52,8 @@
 #include "vfs.h"
 #include <minizip/unzip.h>
 #include <glib.h>
-#define BAD_MINIZ
-#ifndef BAD_MINIZ
+#define GARUX_DISABLE_BAD_MINIZ
+#ifndef GARUX_DISABLE_BAD_MINIZ
 #include "miniz.h"
 #endif
 
@@ -496,7 +496,7 @@ int vfsLoadFile( const char *filename, void **bufferptr, int index ){
 
 
 qboolean vfsPackFile( const char *filename, const char *packname, const int compLevel ){
-#ifndef BAD_MINIZ
+#ifndef GARUX_DISABLE_BAD_MINIZ
 	int i;
 	char tmp[NAME_MAX], fixed[NAME_MAX];
 	GSList *lst;