Skip to content
Permalink
Browse files

Patched stdlib changes to compile on Windows.

  • Loading branch information
icculus committed Dec 9, 2013
1 parent b72c8bc commit 31caa22d309d85131480d10917f0868c9331fbf2
Showing with 5 additions and 4 deletions.
  1. +3 −1 src/atomic/SDL_atomic.c
  2. +1 −2 src/stdlib/SDL_getenv.c
  3. +1 −1 src/stdlib/SDL_string.c
@@ -152,7 +152,9 @@ SDL_AtomicSet(SDL_atomic_t *a, int v)
void*
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);
#elif defined(HAVE_GCC_ATOMICS)
return __sync_lock_test_and_set(a, v);
@@ -26,13 +26,12 @@

#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! */
static char *SDL_envmem = NULL; /* Ugh, memory leak */
static size_t SDL_envmemlen = 0;
#endif


/* Put a variable into the environment */
#if defined(HAVE_SETENV)
int
@@ -986,7 +986,7 @@ SDL_vsscanf(const char *text, const char *fmt, va_list ap)
}
#else
int
SDL_vsscanf(const char *text, const char *fmt, ...)
SDL_vsscanf(const char *text, const char *fmt, va_list ap)
{
int retval = 0;

0 comments on commit 31caa22

Please sign in to comment.