thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: Unify definition of scumm_str(n)icmp

Browse source
This commit is contained in:
Max Horn 2011-05-05 16:44:36 +02:00
parent 6eba8e8292
commit dfff22e56b
1 changed files with 16 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

55
common/scummsys.h
View file

@ -140,6 +140,20 @@
#define SCUMMVM_DONT_DEFINE_TYPES #define SCUMMVM_DONT_DEFINE_TYPES
#endif #endif
//
// Define scumm_stricmp and scumm_strnicmp
//
#if defined(_WIN32_WCE) || defined(_MSC_VER)
#define scumm_stricmp stricmp
#define scumm_strnicmp _strnicmp
#elif defined(__MINGW32__) || defined(__GP32__) || defined(__DS__)
#define scumm_stricmp stricmp
#define scumm_strnicmp strnicmp
#else
#define scumm_stricmp strcasecmp
#define scumm_strnicmp strncasecmp
#endif
// //
// By default we try to use pragma push/pop to ensure various structs we use // By default we try to use pragma push/pop to ensure various structs we use
@ -157,9 +171,6 @@
#if defined(__SYMBIAN32__) #if defined(__SYMBIAN32__)
#define scumm_stricmp strcasecmp
#define scumm_strnicmp strncasecmp
#define SCUMM_LITTLE_ENDIAN #define SCUMM_LITTLE_ENDIAN
#define SCUMM_NEED_ALIGNMENT #define SCUMM_NEED_ALIGNMENT
@ -184,8 +195,6 @@
#elif defined(_WIN32_WCE) #elif defined(_WIN32_WCE)
#define scumm_stricmp stricmp
#define scumm_strnicmp _strnicmp
#define snprintf _snprintf #define snprintf _snprintf
#define SCUMM_LITTLE_ENDIAN #define SCUMM_LITTLE_ENDIAN
@ -202,8 +211,6 @@
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#define scumm_stricmp stricmp
#define scumm_strnicmp _strnicmp
#define snprintf _snprintf #define snprintf _snprintf
#define SCUMM_LITTLE_ENDIAN #define SCUMM_LITTLE_ENDIAN
@ -215,19 +222,13 @@
#elif defined(__MINGW32__) #elif defined(__MINGW32__)
#define scumm_stricmp stricmp
#define scumm_strnicmp strnicmp
#define SCUMM_LITTLE_ENDIAN #define SCUMM_LITTLE_ENDIAN
#define PLUGIN_EXPORT __declspec(dllexport) #define PLUGIN_EXPORT __declspec(dllexport)
#elif defined(UNIX) #elif defined(UNIX)
#define scumm_stricmp strcasecmp #if !defined(CONFIG_H) && defined(SDL_BACKEND)
#define scumm_strnicmp strncasecmp
#ifndef CONFIG_H
/* need this for the SDL_BYTEORDER define */ /* need this for the SDL_BYTEORDER define */
#include <SDL_byteorder.h> #include <SDL_byteorder.h>
@ -252,17 +253,11 @@
#elif defined(__DC__) #elif defined(__DC__)
#define scumm_stricmp strcasecmp
#define scumm_strnicmp strncasecmp
#define SCUMM_LITTLE_ENDIAN #define SCUMM_LITTLE_ENDIAN
#define SCUMM_NEED_ALIGNMENT #define SCUMM_NEED_ALIGNMENT
#elif defined(__GP32__) #elif defined(__GP32__)
#define scumm_stricmp stricmp
#define scumm_strnicmp strnicmp
#define SCUMM_LITTLE_ENDIAN #define SCUMM_LITTLE_ENDIAN
#define SCUMM_NEED_ALIGNMENT #define SCUMM_NEED_ALIGNMENT
@ -281,17 +276,11 @@
#elif defined(__PLAYSTATION2__) #elif defined(__PLAYSTATION2__)
#define scumm_stricmp strcasecmp
#define scumm_strnicmp strncasecmp
#define SCUMM_LITTLE_ENDIAN #define SCUMM_LITTLE_ENDIAN
#define SCUMM_NEED_ALIGNMENT #define SCUMM_NEED_ALIGNMENT
#elif defined(__N64__) #elif defined(__N64__)
#define scumm_stricmp strcasecmp
#define scumm_strnicmp strncasecmp
#define SCUMM_BIG_ENDIAN #define SCUMM_BIG_ENDIAN
#define SCUMM_NEED_ALIGNMENT #define SCUMM_NEED_ALIGNMENT
@ -314,9 +303,6 @@
#include <malloc.h> #include <malloc.h>
#include "backends/platform/psp/memory.h" #include "backends/platform/psp/memory.h"
#define scumm_stricmp strcasecmp
#define scumm_strnicmp strncasecmp
#define SCUMM_LITTLE_ENDIAN #define SCUMM_LITTLE_ENDIAN
#define SCUMM_NEED_ALIGNMENT #define SCUMM_NEED_ALIGNMENT
@ -325,16 +311,10 @@
#elif defined(__amigaos4__) #elif defined(__amigaos4__)
#define scumm_stricmp strcasecmp
#define scumm_strnicmp strncasecmp
#define SCUMM_BIG_ENDIAN #define SCUMM_BIG_ENDIAN
#define SCUMM_NEED_ALIGNMENT #define SCUMM_NEED_ALIGNMENT
#elif defined (__DS__) #elif defined(__DS__)
#define scumm_stricmp stricmp
#define scumm_strnicmp strnicmp
#define SCUMM_NEED_ALIGNMENT #define SCUMM_NEED_ALIGNMENT
#define SCUMM_LITTLE_ENDIAN #define SCUMM_LITTLE_ENDIAN
@ -346,9 +326,6 @@
#elif defined(__WII__) #elif defined(__WII__)
#define scumm_stricmp strcasecmp
#define scumm_strnicmp strncasecmp
#define SCUMM_BIG_ENDIAN #define SCUMM_BIG_ENDIAN
#define SCUMM_NEED_ALIGNMENT #define SCUMM_NEED_ALIGNMENT