Garux: renamed disable defines

diff --git a/libs/stringio.h b/libs/stringio.h
index 7d192a2ad13eb26d60cd962f53a2d9dff41a7d38..f8814ba8703a43cbf466cd2708aa86c8d6bf65ca 100644 (file)
--- 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 d26e224906917a4020fbd4d2dd7c4a168e869ed8..48a1f86fbde046b5b81b411cb15f18167991125e 100644 (file)
--- 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;