diff --git a/common/port.h b/common/port.h index ae60122f..d56dac85 100644 --- a/common/port.h +++ b/common/port.h @@ -19,6 +19,9 @@ GNU General Public License for more details. #include "build.h" +#define PATH_SEPARATOR_NIX '/' +#define PATH_SEPARATOR_WIN '\\' + #if !XASH_WIN32 #if XASH_APPLE #include @@ -41,14 +44,14 @@ GNU General Public License for more details. #include #include - #define PATH_SPLITTER "/" + #define PATH_SEPARATOR PATH_SEPARATOR_NIX #define HAVE_DUP #define O_BINARY 0 #define O_TEXT 0 #define _mkdir( x ) mkdir( x, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH ) #elif XASH_DOS4GW - #define PATH_SPLITTER "\\" + #define PATH_SEPARATOR PATH_SEPARATOR_WIN #endif typedef void* HANDLE; @@ -59,7 +62,7 @@ GNU General Public License for more details. int x, y; } POINT; #else // WIN32 - #define PATH_SPLITTER "\\" + #define PATH_SEPARATOR PATH_SEPARATOR_WIN #ifdef __MINGW32__ #define _inline static inline #define FORCEINLINE inline __attribute__((always_inline)) @@ -87,6 +90,12 @@ GNU General Public License for more details. #define XASH_LOW_MEMORY 0 #endif +#if PATH_SEPARATOR == PATH_SEPARATOR_WIN +#define PATH_SEPARATOR_STR "\\" +#else // PATH_SEPARATOR == PATH_SEPARATOR_NIX +#define PATH_SEPARATOR_STR "/" +#endif + #include #include #include diff --git a/public/crtlib.c b/public/crtlib.c index 25af49de..5b830cd4 100644 --- a/public/crtlib.c +++ b/public/crtlib.c @@ -824,8 +824,8 @@ void COM_FixSlashes( char *pname ) { while( *pname ) { - if( *pname == '\\' ) - *pname = '/'; + if( *pname == PATH_SEPARATOR_WIN ) + *pname = PATH_SEPARATOR_NIX; pname++; } }