diff --git a/common/port.h b/common/port.h index d56dac85..05a732da 100644 --- a/common/port.h +++ b/common/port.h @@ -19,9 +19,6 @@ 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 @@ -43,15 +40,10 @@ GNU General Public License for more details. #if XASH_POSIX #include #include - - #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_SEPARATOR PATH_SEPARATOR_WIN #endif typedef void* HANDLE; @@ -62,7 +54,6 @@ GNU General Public License for more details. int x, y; } POINT; #else // WIN32 - #define PATH_SEPARATOR PATH_SEPARATOR_WIN #ifdef __MINGW32__ #define _inline static inline #define FORCEINLINE inline __attribute__((always_inline)) @@ -90,12 +81,6 @@ 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 3561a1be..a0867558 100644 --- a/public/crtlib.c +++ b/public/crtlib.c @@ -837,16 +837,15 @@ void COM_RemoveLineFeed( char *str ) ============ COM_FixSlashes -Changes all '/' characters into '\' characters, in place. +Changes all '\' characters into '/' characters, in place. ============ */ void COM_FixSlashes( char *pname ) { - while( *pname ) + for( ; *pname; pname++ ) { - if( *pname == PATH_SEPARATOR_WIN ) - *pname = PATH_SEPARATOR_NIX; - pname++; + if( *pname == '\\' ) + *pname = '/'; } }