Merge commit '146d231d90b19e2a0edcabff1c4eb9ca44e053e7' into master-merge

[xonotic/netradiant.git] / tools / quake3 / q3data / q3data.c

diff --git a/tools/quake3/q3data/q3data.c b/tools/quake3/q3data/q3data.c
index f517beb0e47afa2a4749b9ff73a553de2d8f70e3..3f74d27f44a96ec98070f293a42069bcf4740b45 100644 (file)
--- a/tools/quake3/q3data/q3data.c
+++ b/tools/quake3/q3data/q3data.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,9 +19,12 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef WIN32
+#include "globaldefs.h"
+
+#if GDEF_OS_WINDOWS
 #include <io.h>
-#endif
+#endif // GDEF_OS_WINDOWS
+
 #include "q3data.h"
 #include "md3lib.h"
 
@@ -37,12 +40,10 @@ qboolean g_skipmodel;           // set true when a cd is not g_only
 
 // bogus externs for some TA hacks (common/ using them against q3map)
 char *moddir = NULL;
-// some old defined that was in cmdlib lost during merge
-char writedir[1024];
 
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if !GDEF_OS_WINDOWS
 #define strlwr strlower
-#endif
+#endif // !GDEF_OS_WINDOWS
 
 /*
    =======================================================
@@ -301,7 +302,7 @@ void Cmd_File( void ){
 
    ===============
  */
-#ifdef _WIN32
+#if GDEF_OS_WINDOWS
 #include "io.h"
 void PackDirectory_r( char *dir ){
        struct _finddata_t fileinfo;
@@ -334,7 +335,7 @@ void PackDirectory_r( char *dir ){
 #else
 
 #include <sys/types.h>
-#ifndef WIN32
+#if !GDEF_OS_WINDOWS
 #include <sys/dir.h>
 #else
 #include <sys/dirent.h>
@@ -560,8 +561,6 @@ void ParseScript( void ){
 
 //=======================================================
 
-#include "version.h"
-
 /*
    ==============
    main
@@ -573,7 +572,7 @@ int main( int argc, char **argv ){
 
        // using GtkRadiant's versioning next to Id's versioning
        printf( "Q3Data      - (c) 1999 Id Software Inc.\n" );
-       printf( "NetRadiant  - v" RADIANT_VERSION " " __DATE__ "\n" );
+       printf( RADIANT_NAME " - v" RADIANT_VERSION " " __DATE__ "\n" );
 
        ExpandWildcards( &argc, &argv );