tools: reduce diff noise

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

diff --git a/tools/quake3/common/aselib.c b/tools/quake3/common/aselib.c
index 6b92d0351c8d920f57d7231c5977d4835a143da1..4961647e248970ba6cc218d4168451b7ba2fc3bd 100644 (file)
--- a/tools/quake3/common/aselib.c
+++ b/tools/quake3/common/aselib.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.
@@ -19,8 +19,8 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #include "aselib.h"
+#include "globaldefs.h"
 #include "inout.h"
 
 #include <assert.h>
@@ -114,7 +114,7 @@ static char gl_filename[1024];
 static void ASE_Process( void );
 static void ASE_FreeGeomObject( int ndx );
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if GDEF_OS_LINUX || GDEF_OS_MACOS
 
 static char* strlwr( char* string ){
        char *cp;
@@ -411,9 +411,9 @@ static void ASE_SkipRestOfLine( void ){
 }
 
 static void ASE_KeyMAP_DIFFUSE( const char *token ){
-       char fullpath[1024], bitmap[1024], modeldir[1024];
+       char bitmap[1024];
        char filename[1024];
-       int i = 0, count;
+       int i = 0;
 
        strcpy( filename, gl_filename );
 
@@ -472,7 +472,7 @@ static void ASE_KeyMAP_DIFFUSE( const char *token ){
                else
                {
                        sprintf( ase.materials[ase.numMaterials].name, "(not converted: '%s')", bitmap );
-                       Sys_Printf( "WARNING: illegal material name '%s'\n", bitmap );
+                       Sys_FPrintf( SYS_WRN, "WARNING: illegal material name '%s'\n", bitmap );
                }
        }
        else