diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/cbasetypes.h | 6 | ||||
| -rw-r--r-- | src/common/mmo.h | 19 |
2 files changed, 6 insertions, 19 deletions
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h index b513b7fa3..6db351b67 100644 --- a/src/common/cbasetypes.h +++ b/src/common/cbasetypes.h @@ -198,8 +198,14 @@ typedef unsigned long long uint64; #if defined(_MSC_VER) || defined(__BORLANDC__) #define strcasecmp stricmp #define strncasecmp strnicmp +#define strncmpi strnicmp #define snprintf _snprintf #define vsnprintf _vsnprintf +#else +#define strcmpi strcasecmp +#define stricmp strcasecmp +#define strncmpi strncasecmp +#define strnicmp strncasecmp #endif // keyword replacement in windows diff --git a/src/common/mmo.h b/src/common/mmo.h index 75b741697..bd5a067d9 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -489,23 +489,4 @@ enum { JOB_SOUL_LINKER, }; -#ifndef __WIN32 - #ifndef strcmpi - #define strcmpi strcasecmp - #endif - #ifndef stricmp - #define stricmp strcasecmp - #endif - #ifndef strncmpi - #define strncmpi strncasecmp - #endif - #ifndef strnicmp - #define strnicmp strncasecmp - #endif -#else - #ifndef strncmpi - #define strncmpi strnicmp - #endif -#endif - #endif /* _MMO_H_ */ |