oslibs, SDL-1.2: rebuilt from latest code (1.2.16).

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1620 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2019-08-23 08:47:40 +00:00
parent 152063a205
commit 58bb88d36d
6 changed files with 32 additions and 20 deletions

View file

@ -114,6 +114,10 @@ typedef unsigned int uintptr_t;
#define HAVE_STRTOLL 1 #define HAVE_STRTOLL 1
#define HAVE_STRTOULL 1 #define HAVE_STRTOULL 1
#endif #endif
#if defined(__WATCOMC__) || (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(_WIN64)
#define HAVE__STRTOI64 1
#define HAVE__STRTOUI64 1
#endif
#define HAVE_STRTOD 1 #define HAVE_STRTOD 1
#define HAVE_ATOI 1 #define HAVE_ATOI 1
#define HAVE_ATOF 1 #define HAVE_ATOF 1

View file

@ -505,13 +505,17 @@ extern DECLSPEC char* SDLCALL SDL_lltoa(Sint64 value, char *string, int radix);
extern DECLSPEC char* SDLCALL SDL_ulltoa(Uint64 value, char *string, int radix); extern DECLSPEC char* SDLCALL SDL_ulltoa(Uint64 value, char *string, int radix);
#endif #endif
#ifdef HAVE_STRTOLL #ifdef HAVE__STRTOI64
#define SDL_strtoll _strtoi64
#elif defined(HAVE_STRTOLL)
#define SDL_strtoll strtoll #define SDL_strtoll strtoll
#else #else
extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *string, char **endp, int base); extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *string, char **endp, int base);
#endif #endif
#ifdef HAVE_STRTOULL #ifdef HAVE__STRTOUI64
#define SDL_strtoull _strtoui64
#elif defined(HAVE_STRTOULL)
#define SDL_strtoull strtoull #define SDL_strtoull strtoull
#else #else
extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *string, char **endp, int base); extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *string, char **endp, int base);
@ -549,18 +553,18 @@ extern DECLSPEC int SDLCALL SDL_strcmp(const char *str1, const char *str2);
extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2, size_t maxlen); extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2, size_t maxlen);
#endif #endif
#ifdef HAVE_STRCASECMP #if defined(HAVE__STRICMP)
#define SDL_strcasecmp strcasecmp
#elif defined(HAVE__STRICMP)
#define SDL_strcasecmp _stricmp #define SDL_strcasecmp _stricmp
#elif defined(HAVE_STRCASECMP)
#define SDL_strcasecmp strcasecmp
#else #else
extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1, const char *str2); extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1, const char *str2);
#endif #endif
#ifdef HAVE_STRNCASECMP #if defined(HAVE__STRNICMP)
#define SDL_strncasecmp strncasecmp
#elif defined(HAVE__STRNICMP)
#define SDL_strncasecmp _strnicmp #define SDL_strncasecmp _strnicmp
#elif defined(HAVE_STRNCASECMP)
#define SDL_strncasecmp strncasecmp
#else #else
extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2, size_t maxlen); extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2, size_t maxlen);
#endif #endif
@ -571,13 +575,13 @@ extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2,
extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, const char *fmt, ...); extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, const char *fmt, ...);
#endif #endif
#ifdef HAVE_SNPRINTF #if defined(HAVE_SNPRINTF) && !(defined(__WATCOMC__) || defined(_WIN32))
#define SDL_snprintf snprintf #define SDL_snprintf snprintf
#else #else
extern DECLSPEC int SDLCALL SDL_snprintf(char *text, size_t maxlen, const char *fmt, ...); extern DECLSPEC int SDLCALL SDL_snprintf(char *text, size_t maxlen, const char *fmt, ...);
#endif #endif
#ifdef HAVE_VSNPRINTF #if defined(HAVE_VSNPRINTF) && !(defined(__WATCOMC__) || defined(_WIN32))
#define SDL_vsnprintf vsnprintf #define SDL_vsnprintf vsnprintf
#else #else
extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap); extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap);

View file

@ -505,13 +505,17 @@ extern DECLSPEC char* SDLCALL SDL_lltoa(Sint64 value, char *string, int radix);
extern DECLSPEC char* SDLCALL SDL_ulltoa(Uint64 value, char *string, int radix); extern DECLSPEC char* SDLCALL SDL_ulltoa(Uint64 value, char *string, int radix);
#endif #endif
#ifdef HAVE_STRTOLL #ifdef HAVE__STRTOI64
#define SDL_strtoll _strtoi64
#elif defined(HAVE_STRTOLL)
#define SDL_strtoll strtoll #define SDL_strtoll strtoll
#else #else
extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *string, char **endp, int base); extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *string, char **endp, int base);
#endif #endif
#ifdef HAVE_STRTOULL #ifdef HAVE__STRTOUI64
#define SDL_strtoull _strtoui64
#elif defined(HAVE_STRTOULL)
#define SDL_strtoull strtoull #define SDL_strtoull strtoull
#else #else
extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *string, char **endp, int base); extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *string, char **endp, int base);
@ -549,18 +553,18 @@ extern DECLSPEC int SDLCALL SDL_strcmp(const char *str1, const char *str2);
extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2, size_t maxlen); extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2, size_t maxlen);
#endif #endif
#ifdef HAVE_STRCASECMP #if defined(HAVE__STRICMP)
#define SDL_strcasecmp strcasecmp
#elif defined(HAVE__STRICMP)
#define SDL_strcasecmp _stricmp #define SDL_strcasecmp _stricmp
#elif defined(HAVE_STRCASECMP)
#define SDL_strcasecmp strcasecmp
#else #else
extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1, const char *str2); extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1, const char *str2);
#endif #endif
#ifdef HAVE_STRNCASECMP #if defined(HAVE__STRNICMP)
#define SDL_strncasecmp strncasecmp
#elif defined(HAVE__STRNICMP)
#define SDL_strncasecmp _strnicmp #define SDL_strncasecmp _strnicmp
#elif defined(HAVE_STRNCASECMP)
#define SDL_strncasecmp strncasecmp
#else #else
extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2, size_t maxlen); extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2, size_t maxlen);
#endif #endif
@ -571,13 +575,13 @@ extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2,
extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, const char *fmt, ...); extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, const char *fmt, ...);
#endif #endif
#ifdef HAVE_SNPRINTF #if defined(HAVE_SNPRINTF) && !(defined(__WATCOMC__) || defined(_WIN32))
#define SDL_snprintf snprintf #define SDL_snprintf snprintf
#else #else
extern DECLSPEC int SDLCALL SDL_snprintf(char *text, size_t maxlen, const char *fmt, ...); extern DECLSPEC int SDLCALL SDL_snprintf(char *text, size_t maxlen, const char *fmt, ...);
#endif #endif
#ifdef HAVE_VSNPRINTF #if defined(HAVE_VSNPRINTF) && !(defined(__WATCOMC__) || defined(_WIN32))
#define SDL_vsnprintf vsnprintf #define SDL_vsnprintf vsnprintf
#else #else
extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap); extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap);

Binary file not shown.

Binary file not shown.