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

public: completely get rid of PATH_SEPARATOR macros

Browse Source
This commit is contained in:
Alibek Omarov 2023-01-05 06:06:07 +03:00
parent 34eb258cae
commit 4684f174ee
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/port.h
View File

@ -19,9 +19,6 @@ 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>
@ -43,15 +40,10 @@ GNU General Public License for more details.
#if XASH_POSIX #if XASH_POSIX
#include <unistd.h> #include <unistd.h>
#include <dlfcn.h> #include <dlfcn.h>
#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
#define PATH_SEPARATOR PATH_SEPARATOR_WIN
#endif #endif
typedef void* HANDLE; typedef void* HANDLE;
@ -62,7 +54,6 @@ GNU General Public License for more details.
int x, y; int x, y;
} POINT; } POINT;
#else // WIN32 #else // WIN32
#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))
@ -90,12 +81,6 @@ 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>

9
public/crtlib.c
View File

@ -837,16 +837,15 @@ void COM_RemoveLineFeed( char *str )
============ ============
COM_FixSlashes COM_FixSlashes
Changes all '/' characters into '\' characters, in place. Changes all '\' characters into '/' characters, in place.
============ ============
*/ */
void COM_FixSlashes( char *pname ) void COM_FixSlashes( char *pname )
{ {
while( *pname ) for( ; *pname; pname++ )
{ {
if( *pname == PATH_SEPARATOR_WIN ) if( *pname == '\\' )
*pname = PATH_SEPARATOR_NIX; *pname = '/';
pname++;
} }
} }