YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

common: rename PATH_SPLITTER to PATH_SEPARATOR, change it's type to character

Browse Source
This commit is contained in:
Alibek Omarov 2022-12-19 15:10:42 +03:00
parent 071638794a
commit e1ea3387ee
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/port.h
View File

@ -19,6 +19,9 @@ GNU General Public License for more details.
#include "build.h" #include "build.h"
#define PATH_SEPARATOR_NIX '/'
#define PATH_SEPARATOR_WIN '\\'
#if !XASH_WIN32 #if !XASH_WIN32
#if XASH_APPLE #if XASH_APPLE
#include <sys/syslimits.h> #include <sys/syslimits.h>
@ -41,14 +44,14 @@ GNU General Public License for more details.
#include <unistd.h> #include <unistd.h>
#include <dlfcn.h> #include <dlfcn.h>
#define PATH_SPLITTER "/" #define PATH_SEPARATOR PATH_SEPARATOR_NIX
#define HAVE_DUP #define HAVE_DUP
#define O_BINARY 0 #define O_BINARY 0
#define O_TEXT 0 #define O_TEXT 0
#define _mkdir( x ) mkdir( x, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH ) #define _mkdir( x ) mkdir( x, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH )
#elif XASH_DOS4GW #elif XASH_DOS4GW
#define PATH_SPLITTER "\\" #define PATH_SEPARATOR PATH_SEPARATOR_WIN
#endif #endif
typedef void* HANDLE; typedef void* HANDLE;
@ -59,7 +62,7 @@ GNU General Public License for more details.
int x, y; int x, y;
} POINT; } POINT;
#else // WIN32 #else // WIN32
#define PATH_SPLITTER "\\" #define PATH_SEPARATOR PATH_SEPARATOR_WIN
#ifdef __MINGW32__ #ifdef __MINGW32__
#define _inline static inline #define _inline static inline
#define FORCEINLINE inline __attribute__((always_inline)) #define FORCEINLINE inline __attribute__((always_inline))
@ -87,6 +90,12 @@ GNU General Public License for more details.
#define XASH_LOW_MEMORY 0 #define XASH_LOW_MEMORY 0
#endif #endif
#if PATH_SEPARATOR == PATH_SEPARATOR_WIN
#define PATH_SEPARATOR_STR "\\"
#else // PATH_SEPARATOR == PATH_SEPARATOR_NIX
#define PATH_SEPARATOR_STR "/"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <limits.h> #include <limits.h>

4
public/crtlib.c
View File

@ -824,8 +824,8 @@ void COM_FixSlashes( char *pname )
{ {
while( *pname ) while( *pname )
{ {
if( *pname == '\\' ) if( *pname == PATH_SEPARATOR_WIN )
*pname = '/'; *pname = PATH_SEPARATOR_NIX;
pname++; pname++;
} }
} }