sdl 2.0.8 update

2026-04-24 05:45:40 +00:00 · 2018-05-09 23:09:05 +10:00 · 2018-05-09 23:09:05 +10:00 · bfb08f9482
commit bfb08f9482
parent 7f674a59c6
894 changed files with 66879 additions and 43299 deletions
--- a/Engine/lib/sdl/src/thread/SDL_systhread.h
+++ b/Engine/lib/sdl/src/thread/SDL_systhread.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -22,8 +22,8 @@

 /* These are functions that need to be implemented by a port of SDL */

-#ifndef _SDL_systhread_h
-#define _SDL_systhread_h
+#ifndef SDL_systhread_h_
+#define SDL_systhread_h_

 #include "SDL_thread.h"
 #include "SDL_thread_c.h"
@ -55,7 +55,7 @@ extern void SDL_SYS_WaitThread(SDL_Thread * thread);
 extern void SDL_SYS_DetachThread(SDL_Thread * thread);

 /* Get the thread local storage for this thread */
-extern SDL_TLSData *SDL_SYS_GetTLSData();
+extern SDL_TLSData *SDL_SYS_GetTLSData(void);

 /* Set the thread local storage for this thread */
 extern int SDL_SYS_SetTLSData(SDL_TLSData *data);
@ -65,6 +65,6 @@ extern SDL_Thread *
 SDL_CreateThreadInternal(int (SDLCALL * fn) (void *), const char *name,
                         const size_t stacksize, void *data);

-#endif /* _SDL_systhread_h */
+#endif /* SDL_systhread_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
--- a/Engine/lib/sdl/src/thread/SDL_thread.c
+++ b/Engine/lib/sdl/src/thread/SDL_thread.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -50,7 +50,7 @@ SDL_TLSGet(SDL_TLSID id)
 }

 int
-SDL_TLSSet(SDL_TLSID id, const void *value, void (*destructor)(void *))
+SDL_TLSSet(SDL_TLSID id, const void *value, void (SDLCALL *destructor)(void *))
 {
    SDL_TLSData *storage;

@ -121,7 +121,7 @@ static SDL_TLSEntry *SDL_generic_TLS;


 SDL_TLSData *
-SDL_Generic_GetTLSData()
+SDL_Generic_GetTLSData(void)
 {
    SDL_threadID thread = SDL_ThreadID();
    SDL_TLSEntry *entry;
--- a/Engine/lib/sdl/src/thread/SDL_thread_c.h
+++ b/Engine/lib/sdl/src/thread/SDL_thread_c.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -20,8 +20,8 @@
 */
 #include "../SDL_internal.h"

-#ifndef _SDL_thread_c_h
-#define _SDL_thread_c_h
+#ifndef SDL_thread_c_h_
+#define SDL_thread_c_h_

 #include "SDL_thread.h"

@ -71,7 +71,7 @@ typedef struct {
    unsigned int limit;
    struct {
        void *data;
-        void (*destructor)(void*);
+        void (SDLCALL *destructor)(void*);
    } array[1];
 } SDL_TLSData;

@ -82,7 +82,7 @@ typedef struct {
   This is only intended as a fallback if getting real thread-local
   storage fails or isn't supported on this platform.
 */
-extern SDL_TLSData *SDL_Generic_GetTLSData();
+extern SDL_TLSData *SDL_Generic_GetTLSData(void);

 /* Set cross-platform, slow, thread local storage for this thread.
   This is only intended as a fallback if getting real thread-local
@ -90,6 +90,6 @@ extern SDL_TLSData *SDL_Generic_GetTLSData();
 */
 extern int SDL_Generic_SetTLSData(SDL_TLSData *data);

-#endif /* _SDL_thread_c_h */
+#endif /* SDL_thread_c_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
--- a/Engine/lib/sdl/src/thread/generic/SDL_syscond.c
+++ b/Engine/lib/sdl/src/thread/generic/SDL_syscond.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/Engine/lib/sdl/src/thread/generic/SDL_sysmutex.c
+++ b/Engine/lib/sdl/src/thread/generic/SDL_sysmutex.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/Engine/lib/sdl/src/thread/generic/SDL_sysmutex_c.h
+++ b/Engine/lib/sdl/src/thread/generic/SDL_sysmutex_c.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/Engine/lib/sdl/src/thread/generic/SDL_syssem.c
+++ b/Engine/lib/sdl/src/thread/generic/SDL_syssem.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/Engine/lib/sdl/src/thread/generic/SDL_systhread.c
+++ b/Engine/lib/sdl/src/thread/generic/SDL_systhread.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/Engine/lib/sdl/src/thread/generic/SDL_systhread_c.h
+++ b/Engine/lib/sdl/src/thread/generic/SDL_systhread_c.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/Engine/lib/sdl/src/thread/generic/SDL_systls.c
+++ b/Engine/lib/sdl/src/thread/generic/SDL_systls.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -24,7 +24,7 @@


 SDL_TLSData *
-SDL_SYS_GetTLSData()
+SDL_SYS_GetTLSData(void)
 {
    return SDL_Generic_GetTLSData();
 }
--- a/Engine/lib/sdl/src/thread/psp/SDL_syscond.c
+++ b/Engine/lib/sdl/src/thread/psp/SDL_syscond.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/Engine/lib/sdl/src/thread/psp/SDL_sysmutex.c
+++ b/Engine/lib/sdl/src/thread/psp/SDL_sysmutex.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/Engine/lib/sdl/src/thread/psp/SDL_sysmutex_c.h
+++ b/Engine/lib/sdl/src/thread/psp/SDL_sysmutex_c.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/Engine/lib/sdl/src/thread/psp/SDL_syssem.c
+++ b/Engine/lib/sdl/src/thread/psp/SDL_syssem.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -108,7 +108,7 @@ int SDL_SemWaitTimeout(SDL_sem *sem, Uint32 timeout)
               case SCE_KERNEL_ERROR_WAIT_TIMEOUT:
                       return SDL_MUTEX_TIMEDOUT;
               default:
-                       return SDL_SetError("WaitForSingleObject() failed");
+                       return SDL_SetError("sceKernelWaitSema() failed");
    }
 }

--- a/Engine/lib/sdl/src/thread/psp/SDL_systhread.c
+++ b/Engine/lib/sdl/src/thread/psp/SDL_systhread.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/Engine/lib/sdl/src/thread/psp/SDL_systhread_c.h
+++ b/Engine/lib/sdl/src/thread/psp/SDL_systhread_c.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/Engine/lib/sdl/src/thread/pthread/SDL_syscond.c
+++ b/Engine/lib/sdl/src/thread/pthread/SDL_syscond.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -42,7 +42,7 @@ SDL_CreateCond(void)

    cond = (SDL_cond *) SDL_malloc(sizeof(SDL_cond));
    if (cond) {
-        if (pthread_cond_init(&cond->cond, NULL) < 0) {
+        if (pthread_cond_init(&cond->cond, NULL) != 0) {
            SDL_SetError("pthread_cond_init() failed");
            SDL_free(cond);
            cond = NULL;
@ -129,7 +129,7 @@ SDL_CondWaitTimeout(SDL_cond * cond, SDL_mutex * mutex, Uint32 ms)
    switch (retval) {
    case EINTR:
        goto tryagain;
-        break;
+        /* break; -Wunreachable-code-break */
    case ETIMEDOUT:
        retval = SDL_MUTEX_TIMEDOUT;
        break;
--- a/Engine/lib/sdl/src/thread/pthread/SDL_sysmutex.c
+++ b/Engine/lib/sdl/src/thread/pthread/SDL_sysmutex.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -20,9 +20,6 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #include <errno.h>
 #include <pthread.h>

@ -108,7 +105,7 @@ SDL_LockMutex(SDL_mutex * mutex)
        }
    }
 #else
-    if (pthread_mutex_lock(&mutex->id) < 0) {
+    if (pthread_mutex_lock(&mutex->id) != 0) {
        return SDL_SetError("pthread_mutex_lock() failed");
    }
 #endif
@ -137,7 +134,7 @@ SDL_TryLockMutex(SDL_mutex * mutex)
         We set the locking thread id after we obtain the lock
         so unlocks from other threads will fail.
         */
-        if (pthread_mutex_lock(&mutex->id) == 0) {
+        if (pthread_mutex_trylock(&mutex->id) == 0) {
            mutex->owner = this_thread;
            mutex->recursive = 0;
        } else if (errno == EBUSY) {
@ -184,7 +181,7 @@ SDL_UnlockMutex(SDL_mutex * mutex)
    }

 #else
-    if (pthread_mutex_unlock(&mutex->id) < 0) {
+    if (pthread_mutex_unlock(&mutex->id) != 0) {
        return SDL_SetError("pthread_mutex_unlock() failed");
    }
 #endif /* FAKE_RECURSIVE_MUTEX */
--- a/Engine/lib/sdl/src/thread/pthread/SDL_sysmutex_c.h
+++ b/Engine/lib/sdl/src/thread/pthread/SDL_sysmutex_c.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -20,13 +20,13 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_mutex_c_h
-#define _SDL_mutex_c_h
+#ifndef SDL_mutex_c_h_
+#define SDL_mutex_c_h_

 struct SDL_mutex
 {
    pthread_mutex_t id;
 };

-#endif /* _SDL_mutex_c_h */
+#endif /* SDL_mutex_c_h_ */
 /* vi: set ts=4 sw=4 expandtab: */
--- a/Engine/lib/sdl/src/thread/pthread/SDL_syssem.c
+++ b/Engine/lib/sdl/src/thread/pthread/SDL_syssem.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -20,9 +20,6 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #include <errno.h>
 #include <pthread.h>
 #include <semaphore.h>
@ -94,7 +91,10 @@ SDL_SemWait(SDL_sem * sem)
        return SDL_SetError("Passed a NULL semaphore");
    }

-    retval = sem_wait(&sem->sem);
+    do {
+        retval = sem_wait(&sem->sem);
+    } while (retval < 0 && errno == EINTR);
+
    if (retval < 0) {
        retval = SDL_SetError("sem_wait() failed");
    }
--- a/Engine/lib/sdl/src/thread/pthread/SDL_systhread.c
+++ b/Engine/lib/sdl/src/thread/pthread/SDL_systhread.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -52,7 +52,7 @@
 #endif

 #ifdef __HAIKU__
-#include <be/kernel/OS.h>
+#include <kernel/OS.h>
 #endif

 #include "SDL_assert.h"
@ -212,7 +212,7 @@ SDL_SYS_SetThreadPriority(SDL_ThreadPriority priority)
    int policy;
    pthread_t thread = pthread_self();

-    if (pthread_getschedparam(thread, &policy, &sched) < 0) {
+    if (pthread_getschedparam(thread, &policy, &sched) != 0) {
        return SDL_SetError("pthread_getschedparam() failed");
    }
    if (priority == SDL_THREAD_PRIORITY_LOW) {
@ -224,7 +224,7 @@ SDL_SYS_SetThreadPriority(SDL_ThreadPriority priority)
        int max_priority = sched_get_priority_max(policy);
        sched.sched_priority = (min_priority + (max_priority - min_priority) / 2);
    }
-    if (pthread_setschedparam(thread, policy, &sched) < 0) {
+    if (pthread_setschedparam(thread, policy, &sched) != 0) {
        return SDL_SetError("pthread_setschedparam() failed");
    }
    return 0;
--- a/Engine/lib/sdl/src/thread/pthread/SDL_systhread_c.h
+++ b/Engine/lib/sdl/src/thread/pthread/SDL_systhread_c.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/Engine/lib/sdl/src/thread/pthread/SDL_systls.c
+++ b/Engine/lib/sdl/src/thread/pthread/SDL_systls.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -20,6 +20,7 @@
 */
 #include "../../SDL_internal.h"
 #include "SDL_thread.h"
+#include "../SDL_systhread.h"
 #include "../SDL_thread_c.h"

 #include <pthread.h>
@ -31,7 +32,7 @@ static pthread_key_t thread_local_storage = INVALID_PTHREAD_KEY;
 static SDL_bool generic_local_storage = SDL_FALSE;

 SDL_TLSData *
-SDL_SYS_GetTLSData()
+SDL_SYS_GetTLSData(void)
 {
    if (thread_local_storage == INVALID_PTHREAD_KEY && !generic_local_storage) {
        static SDL_SpinLock lock;
--- a/Engine/lib/sdl/src/thread/stdcpp/SDL_syscond.cpp
+++ b/Engine/lib/sdl/src/thread/stdcpp/SDL_syscond.cpp
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/Engine/lib/sdl/src/thread/stdcpp/SDL_sysmutex.cpp
+++ b/Engine/lib/sdl/src/thread/stdcpp/SDL_sysmutex.cpp
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/Engine/lib/sdl/src/thread/stdcpp/SDL_sysmutex_c.h
+++ b/Engine/lib/sdl/src/thread/stdcpp/SDL_sysmutex_c.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/Engine/lib/sdl/src/thread/stdcpp/SDL_systhread.cpp
+++ b/Engine/lib/sdl/src/thread/stdcpp/SDL_systhread.cpp
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -153,7 +153,7 @@ SDL_SYS_DetachThread(SDL_Thread * thread)

 extern "C"
 SDL_TLSData *
-SDL_SYS_GetTLSData()
+SDL_SYS_GetTLSData(void)
 {
    return SDL_Generic_GetTLSData();
 }
--- a/Engine/lib/sdl/src/thread/stdcpp/SDL_systhread_c.h
+++ b/Engine/lib/sdl/src/thread/stdcpp/SDL_systhread_c.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/Engine/lib/sdl/src/thread/windows/SDL_sysmutex.c
+++ b/Engine/lib/sdl/src/thread/windows/SDL_sysmutex.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/Engine/lib/sdl/src/thread/windows/SDL_syssem.c
+++ b/Engine/lib/sdl/src/thread/windows/SDL_syssem.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -90,11 +90,7 @@ SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout)
    } else {
        dwMilliseconds = (DWORD) timeout;
    }
-#if __WINRT__
    switch (WaitForSingleObjectEx(sem->id, dwMilliseconds, FALSE)) {
-#else
-    switch (WaitForSingleObject(sem->id, dwMilliseconds)) {
-#endif
    case WAIT_OBJECT_0:
        InterlockedDecrement(&sem->count);
        retval = 0;
--- a/Engine/lib/sdl/src/thread/windows/SDL_systhread.c
+++ b/Engine/lib/sdl/src/thread/windows/SDL_systhread.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -164,26 +164,55 @@ typedef struct tagTHREADNAME_INFO
 } THREADNAME_INFO;
 #pragma pack(pop)

+
+typedef HRESULT (WINAPI *pfnSetThreadDescription)(HANDLE, PCWSTR);
+
 void
 SDL_SYS_SetupThread(const char *name)
 {
-    if ((name != NULL) && IsDebuggerPresent()) {
-        THREADNAME_INFO inf;
+    if (name != NULL) {
+        #ifndef __WINRT__   /* !!! FIXME: There's no LoadLibrary() in WinRT; don't know if SetThreadDescription is available there at all at the moment. */
+        static pfnSetThreadDescription pSetThreadDescription = NULL;
+        static HMODULE kernel32 = 0;

-        /* C# and friends will try to catch this Exception, let's avoid it. */
-        if (SDL_GetHintBoolean(SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING, SDL_FALSE)) {
-            return;
+        if (!kernel32) {
+            kernel32 = LoadLibraryW(L"kernel32.dll");
+            if (kernel32) {
+                pSetThreadDescription = (pfnSetThreadDescription) GetProcAddress(kernel32, "SetThreadDescription");
+            }
        }

-        /* This magic tells the debugger to name a thread if it's listening. */
-        SDL_zero(inf);
-        inf.dwType = 0x1000;
-        inf.szName = name;
-        inf.dwThreadID = (DWORD) -1;
-        inf.dwFlags = 0;
+        if (pSetThreadDescription != NULL) {
+            WCHAR *strw = WIN_UTF8ToString(name);
+            if (strw) {
+                pSetThreadDescription(GetCurrentThread(), strw);
+                SDL_free(strw);
+            }
+        }
+        #endif

-        /* The debugger catches this, renames the thread, continues on. */
-        RaiseException(0x406D1388, 0, sizeof(inf) / sizeof(ULONG), (const ULONG_PTR*) &inf);
+        /* Presumably some version of Visual Studio will understand SetThreadDescription(),
+           but we still need to deal with older OSes and debuggers. Set it with the arcane
+           exception magic, too. */
+
+        if (IsDebuggerPresent()) {
+            THREADNAME_INFO inf;
+
+            /* C# and friends will try to catch this Exception, let's avoid it. */
+            if (SDL_GetHintBoolean(SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING, SDL_TRUE)) {
+                return;
+            }
+
+            /* This magic tells the debugger to name a thread if it's listening. */
+            SDL_zero(inf);
+            inf.dwType = 0x1000;
+            inf.szName = name;
+            inf.dwThreadID = (DWORD) -1;
+            inf.dwFlags = 0;
+
+            /* The debugger catches this, renames the thread, continues on. */
+            RaiseException(0x406D1388, 0, sizeof(inf) / sizeof(ULONG), (const ULONG_PTR*) &inf);
+        }
    }
 }

--- a/Engine/lib/sdl/src/thread/windows/SDL_systhread_c.h
+++ b/Engine/lib/sdl/src/thread/windows/SDL_systhread_c.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -20,13 +20,13 @@
 */
 #include "../../SDL_internal.h"

-#ifndef _SDL_systhread_c_h
-#define _SDL_systhread_c_h
+#ifndef SDL_systhread_c_h_
+#define SDL_systhread_c_h_

 #include "../../core/windows/SDL_windows.h"

 typedef HANDLE SYS_ThreadHandle;

-#endif /* _SDL_systhread_c_h */
+#endif /* SDL_systhread_c_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
--- a/Engine/lib/sdl/src/thread/windows/SDL_systls.c
+++ b/Engine/lib/sdl/src/thread/windows/SDL_systls.c
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -32,7 +32,7 @@ static DWORD thread_local_storage = TLS_OUT_OF_INDEXES;
 static SDL_bool generic_local_storage = SDL_FALSE;

 SDL_TLSData *
-SDL_SYS_GetTLSData()
+SDL_SYS_GetTLSData(void)
 {
    if (thread_local_storage == TLS_OUT_OF_INDEXES && !generic_local_storage) {
        static SDL_SpinLock lock;