encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patched stdlib changes to compile on Windows.

This commit is contained in:
Ryan C. Gordon 2013-12-09 13:30:35 -05:00
parent b72c8bcaf8
commit 31caa22d30
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/atomic/SDL_atomic.c
View File

@ -152,7 +152,9 @@ SDL_AtomicSet(SDL_atomic_t *a, int v)
void* void*
SDL_AtomicSetPtr(void **a, void *v) SDL_AtomicSetPtr(void **a, void *v)
{ {
#ifdef HAVE_MSC_ATOMICS #if defined(HAVE_MSC_ATOMICS) && (_M_IX86)
return (void *) _InterlockedExchange((long *)a, (long) v);
#elif defined(HAVE_MSC_ATOMICS) && (!_M_IX86)
return _InterlockedExchangePointer(a, v); return _InterlockedExchangePointer(a, v);
#elif defined(HAVE_GCC_ATOMICS) #elif defined(HAVE_GCC_ATOMICS)
return __sync_lock_test_and_set(a, v); return __sync_lock_test_and_set(a, v);

3
src/stdlib/SDL_getenv.c
View File

@ -26,13 +26,12 @@
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#if !defined(SDL_setenv) && defined(__WIN32__) #if defined(__WIN32__) && (!defined(HAVE_SETENV) || !defined(HAVE_GETENV))
/* Note this isn't thread-safe! */ /* Note this isn't thread-safe! */
static char *SDL_envmem = NULL; /* Ugh, memory leak */ static char *SDL_envmem = NULL; /* Ugh, memory leak */
static size_t SDL_envmemlen = 0; static size_t SDL_envmemlen = 0;
#endif #endif
/* Put a variable into the environment */ /* Put a variable into the environment */
#if defined(HAVE_SETENV) #if defined(HAVE_SETENV)
int int

2
src/stdlib/SDL_string.c
View File

@ -986,7 +986,7 @@ SDL_vsscanf(const char *text, const char *fmt, va_list ap)
} }
#else #else
int int
SDL_vsscanf(const char *text, const char *fmt, ...) SDL_vsscanf(const char *text, const char *fmt, va_list ap)
{ {
int retval = 0; int retval = 0;