mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-04-28 02:04:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

WinRT: merged with SDL 2.0.1 codebase

Browse Source
This commit is contained in:
David Ludwig
2013-10-27 21:26:46 -04:00
parent e64e3d8c27 f570effbf5
commit 69c5d21d7d
343 changed files with 12735 additions and 7248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/stdlib/SDL_getenv.c
View File

@@ -20,10 +20,13 @@
*/
#include "SDL_config.h"
#if defined(__WIN32__)
#include "../core/windows/SDL_windows.h"
#endif
#include "SDL_stdinc.h"
#if !defined(SDL_setenv) && defined(__WIN32__)
#include "../core/windows/SDL_windows.h"
/* Note this isn't thread-safe! */
static char *SDL_envmem = NULL; /* Ugh, memory leak */
static size_t SDL_envmemlen = 0;

2
src/stdlib/SDL_iconv.c
View File

@@ -843,7 +843,7 @@ SDL_iconv(SDL_iconv_t cd,
int
SDL_iconv_close(SDL_iconv_t cd)
{
if (cd && cd != (SDL_iconv_t) - 1) {
if (cd != (SDL_iconv_t)-1) {
SDL_free(cd);
}
return 0;

22
src/stdlib/SDL_string.c
View File

@@ -1293,13 +1293,20 @@ int SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap)
}
#else
/* FIXME: implement more of the format specifiers */
typedef enum
{
SDL_CASE_NOCHANGE,
SDL_CASE_LOWER,
SDL_CASE_UPPER
} SDL_letter_case;
typedef struct
{
SDL_bool left_justify;
SDL_bool force_sign;
SDL_bool force_type;
SDL_bool pad_zeroes;
SDL_bool do_lowercase;
SDL_letter_case force_case;
int width;
int radix;
int precision;
@@ -1322,8 +1329,12 @@ SDL_PrintString(char *text, size_t maxlen, SDL_FormatInfo *info, const char *str
length += SDL_strlcpy(text, string, maxlen);
if (info && info->do_lowercase) {
SDL_strlwr(text);
if (info) {
if (info->force_case == SDL_CASE_LOWER) {
SDL_strlwr(text);
} else if (info->force_case == SDL_CASE_UPPER) {
SDL_strupr(text);
}
}
return length;
}
@@ -1573,9 +1584,12 @@ SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap)
break;
case 'p':
case 'x':
info.do_lowercase = SDL_TRUE;
info.force_case = SDL_CASE_LOWER;
/* Fall through to 'X' handling */
case 'X':
if (info.force_case == SDL_CASE_NOCHANGE) {
info.force_case = SDL_CASE_UPPER;
}
if (info.radix == 10) {
info.radix = 16;
}