Really fixed the Mac build this time.

This commit is contained in:
Sam Lantinga 2012-10-23 23:44:56 -07:00
parent b9759c0757
commit 3c2c25f6eb

View file

@ -39,6 +39,12 @@ extern int pthread_setname_np (pthread_t __target_thread, __const char *__name)
#endif #endif
#endif // __LINUX__ #endif // __LINUX__
#if ( (__MACOSX__ && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)) || \
(__IPHONEOS__ && (__IPHONE_OS_VERSION_MAX_ALLOWED >= 30200)) )
#define NEED_DYNAMIC_PTHREAD_SETNAME_NP
#include <dlfcn.h>
#endif
#include "SDL_platform.h" #include "SDL_platform.h"
#include "SDL_thread.h" #include "SDL_thread.h"
#include "../SDL_thread_c.h" #include "../SDL_thread_c.h"
@ -92,8 +98,7 @@ SDL_SYS_SetupThread(const char *name)
sigset_t mask; sigset_t mask;
if (name != NULL) { if (name != NULL) {
#if ( (__MACOSX__ && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)) || \ #ifdef NEED_DYNAMIC_PTHREAD_SETNAME_NP
(__IPHONEOS__ && (__IPHONE_OS_VERSION_MAX_ALLOWED >= 30200)) )
int (*dynamic_pthread_setname_np)(const char*); int (*dynamic_pthread_setname_np)(const char*);
*(void**)(&dynamic_pthread_setname_np) = dlsym(RTLD_DEFAULT, "pthread_setname_np"); *(void**)(&dynamic_pthread_setname_np) = dlsym(RTLD_DEFAULT, "pthread_setname_np");
if ( dynamic_pthread_setname_np ) if ( dynamic_pthread_setname_np )