Fixed build errors on Mac OS X

This commit is contained in:
Sam Lantinga 2013-07-06 00:06:44 -07:00
parent cfd541e89c
commit ed07a40c62
2 changed files with 15 additions and 14 deletions

View file

@ -18,6 +18,7 @@
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#include "SDL_config.h"
/* Math routines from uClibc: http://www.uclibc.org */ /* Math routines from uClibc: http://www.uclibc.org */

View file

@ -389,7 +389,7 @@ size_t
SDL_strlen(const char *string) SDL_strlen(const char *string)
{ {
#if defined(HAVE_STRLEN) #if defined(HAVE_STRLEN)
return strlen(str); return strlen(string);
#else #else
size_t len = 0; size_t len = 0;
while (*string++) { while (*string++) {
@ -403,7 +403,7 @@ size_t
SDL_wcslen(const wchar_t * string) SDL_wcslen(const wchar_t * string)
{ {
#if defined(HAVE_WCSLEN) #if defined(HAVE_WCSLEN)
return wcslen(wstr); return wcslen(string);
#else #else
size_t len = 0; size_t len = 0;
while (*string++) { while (*string++) {
@ -511,7 +511,7 @@ char *
SDL_strdup(const char *string) SDL_strdup(const char *string)
{ {
#if defined(HAVE_STRDUP) #if defined(HAVE_STRDUP)
return strdup(str); return strdup(string);
#else #else
size_t len = SDL_strlen(string) + 1; size_t len = SDL_strlen(string) + 1;
char *newstr = SDL_malloc(len); char *newstr = SDL_malloc(len);
@ -575,9 +575,9 @@ char *
SDL_strchr(const char *string, int c) SDL_strchr(const char *string, int c)
{ {
#ifdef HAVE_STRCHR #ifdef HAVE_STRCHR
return SDL_const_cast(char*,strchr(str, c)); return SDL_const_cast(char*,strchr(string, c));
#elif defined(HAVE_INDEX) #elif defined(HAVE_INDEX)
return SDL_const_cast(char*,index(str, c)); return SDL_const_cast(char*,index(string, c));
#else #else
while (*string) { while (*string) {
if (*string == c) { if (*string == c) {
@ -593,9 +593,9 @@ char *
SDL_strrchr(const char *string, int c) SDL_strrchr(const char *string, int c)
{ {
#ifdef HAVE_STRRCHR #ifdef HAVE_STRRCHR
return SDL_const_cast(char*,strrchr(str, c)); return SDL_const_cast(char*,strrchr(string, c));
#elif defined(HAVE_RINDEX) #elif defined(HAVE_RINDEX)
return SDL_const_cast(char*,rindex(str, c)); return SDL_const_cast(char*,rindex(string, c));
#else #else
const char *bufp = string + SDL_strlen(string) - 1; const char *bufp = string + SDL_strlen(string) - 1;
while (bufp >= string) { while (bufp >= string) {
@ -793,7 +793,7 @@ long
SDL_strtol(const char *string, char **endp, int base) SDL_strtol(const char *string, char **endp, int base)
{ {
#if defined(HAVE_STRTOL) #if defined(HAVE_STRTOL)
return strtol(str, endp, base); return strtol(string, endp, base);
#else #else
size_t len; size_t len;
long value; long value;
@ -818,7 +818,7 @@ unsigned long
SDL_strtoul(const char *string, char **endp, int base) SDL_strtoul(const char *string, char **endp, int base)
{ {
#if defined(HAVE_STRTOUL) #if defined(HAVE_STRTOUL)
return strtoul(str, endp, base); return strtoul(string, endp, base);
#else #else
size_t len; size_t len;
unsigned long value; unsigned long value;
@ -843,7 +843,7 @@ Sint64
SDL_strtoll(const char *string, char **endp, int base) SDL_strtoll(const char *string, char **endp, int base)
{ {
#if defined(HAVE_STRTOLL) #if defined(HAVE_STRTOLL)
return strtoll(str, endp, base); return strtoll(string, endp, base);
#else #else
size_t len; size_t len;
Sint64 value; Sint64 value;
@ -868,7 +868,7 @@ Uint64
SDL_strtoull(const char *string, char **endp, int base) SDL_strtoull(const char *string, char **endp, int base)
{ {
#if defined(HAVE_STRTOULL) #if defined(HAVE_STRTOULL)
return strtoull(str, endp, base); return strtoull(string, endp, base);
#else #else
size_t len; size_t len;
Uint64 value; Uint64 value;
@ -893,7 +893,7 @@ double
SDL_strtod(const char *string, char **endp) SDL_strtod(const char *string, char **endp)
{ {
#if defined(HAVE_STRTOD) #if defined(HAVE_STRTOD)
return strtod(str, endp); return strtod(string, endp);
#else #else
size_t len; size_t len;
double value; double value;
@ -970,9 +970,9 @@ int
SDL_strncasecmp(const char *str1, const char *str2, size_t maxlen) SDL_strncasecmp(const char *str1, const char *str2, size_t maxlen)
{ {
#ifdef HAVE_STRNCASECMP #ifdef HAVE_STRNCASECMP
return strncasecmp(str1, str2, len); return strncasecmp(str1, str2, maxlen);
#elif defined(HAVE__STRNICMP) #elif defined(HAVE__STRNICMP)
return _strnicmp(str1, str2, len); return _strnicmp(str1, str2, maxlen);
#else #else
char a = 0; char a = 0;
char b = 0; char b = 0;