pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Win32 fixes

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401514
This commit is contained in:
Sam Lantinga 2006-03-13 02:06:33 +00:00
parent dda2653f17
commit d99aa28246
7 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.in
View file

@ -116,7 +116,7 @@ if test x$enable_libc = xyes; then
if test x$ac_cv_func_strtod = xyes; then if test x$ac_cv_func_strtod = xyes; then
AC_DEFINE(HAVE_STRTOD) AC_DEFINE(HAVE_STRTOD)
fi fi
AC_CHECK_FUNCS(malloc calloc realloc free getenv putenv unsetenv qsort abs bcopy memset memcpy memmove strlen strlcpy strlcat strdup _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull atoi atof strcmp strncmp stricmp strcasecmp strncasecmp sscanf snprintf vsnprintf iconv sigaction setjmp nanosleep) AC_CHECK_FUNCS(malloc calloc realloc free getenv putenv unsetenv qsort abs bcopy memset memcpy memmove strlen strlcpy strlcat strdup _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull atoi atof strcmp strncmp _stricmp strcasecmp strncasecmp sscanf snprintf vsnprintf iconv sigaction setjmp nanosleep)
AC_CHECK_LIB(m, pow, [BUILD_LDFLAGS="$BUILD_LDFLAGS -lm"]) AC_CHECK_LIB(m, pow, [BUILD_LDFLAGS="$BUILD_LDFLAGS -lm"])
fi fi

2
include/SDL_config.h.in
View file

@ -117,7 +117,7 @@
#undef HAVE_ATOF #undef HAVE_ATOF
#undef HAVE_STRCMP #undef HAVE_STRCMP
#undef HAVE_STRNCMP #undef HAVE_STRNCMP
#undef HAVE_STRICMP #undef HAVE__STRICMP
#undef HAVE_STRCASECMP #undef HAVE_STRCASECMP
#undef HAVE_STRNCASECMP #undef HAVE_STRNCASECMP
#undef HAVE_SSCANF #undef HAVE_SSCANF

3
include/SDL_config_win32.h
View file

@ -102,8 +102,7 @@ typedef unsigned int uintptr_t;
#define HAVE_ATOF 1 #define HAVE_ATOF 1
#define HAVE_STRCMP 1 #define HAVE_STRCMP 1
#define HAVE_STRNCMP 1 #define HAVE_STRNCMP 1
#define HAVE_STRICMP 1 #define HAVE__STRICMP 1
#define HAVE_STRCASECMP 1
#define HAVE_SSCANF 1 #define HAVE_SSCANF 1
#else #else
#define HAVE_STDARG_H 1 #define HAVE_STDARG_H 1

4
include/SDL_stdinc.h
View file

@ -515,8 +515,8 @@ extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2, size
#if HAVE_STRCASECMP #if HAVE_STRCASECMP
#define SDL_strcasecmp strcasecmp #define SDL_strcasecmp strcasecmp
#elif HAVE_STRICMP #elif HAVE__STRICMP
#define SDL_strcasecmp stricmp #define SDL_strcasecmp _stricmp
#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

4
src/stdlib/SDL_iconv.c
View file

@ -401,7 +401,7 @@ size_t SDL_iconv(SDL_iconv_t cd,
if ( srclen < 2 ) { if ( srclen < 2 ) {
return SDL_ICONV_EINVAL; return SDL_ICONV_EINVAL;
} }
p = src; p = (Uint8 *)src;
W2 = ((Uint32)p[0] << 8) | W2 = ((Uint32)p[0] << 8) |
(Uint32)p[1]; (Uint32)p[1];
src += 2; src += 2;
@ -442,7 +442,7 @@ size_t SDL_iconv(SDL_iconv_t cd,
if ( srclen < 2 ) { if ( srclen < 2 ) {
return SDL_ICONV_EINVAL; return SDL_ICONV_EINVAL;
} }
p = src; p = (Uint8 *)src;
W2 = ((Uint32)p[1] << 8) | W2 = ((Uint32)p[1] << 8) |
(Uint32)p[0]; (Uint32)p[0];
src += 2; src += 2;

2
src/stdlib/SDL_string.c
View file

@ -661,7 +661,7 @@ int SDL_strncmp(const char *str1, const char *str2, size_t maxlen)
} }
#endif #endif
#if !defined(HAVE_STRCASECMP) && !defined(HAVE_STRICMP) #if !defined(HAVE_STRCASECMP) && !defined(HAVE__STRICMP)
int SDL_strcasecmp(const char *str1, const char *str2) int SDL_strcasecmp(const char *str1, const char *str2)
{ {
char a = 0; char a = 0;

4
src/video/wincommon/SDL_syswm.c
View file

@ -230,11 +230,11 @@ void WIN_SetWMCaption(_THIS, const char *title, const char *icon)
{ {
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
/* WinCE uses the UNICODE version */ /* WinCE uses the UNICODE version */
LPWSTR lpszW = SDL_iconv_utf8_ucs2(title); LPWSTR lpszW = SDL_iconv_utf8_ucs2((char *)title);
SetWindowText(SDL_Window, lpszW); SetWindowText(SDL_Window, lpszW);
SDL_free(lpszW); SDL_free(lpszW);
#else #else
char *lpsz = SDL_iconv_utf8_latin1(title); char *lpsz = SDL_iconv_utf8_latin1((char *)title);
SetWindowText(SDL_Window, lpsz); SetWindowText(SDL_Window, lpsz);
SDL_free(lpsz); SDL_free(lpsz);
#endif #endif