Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Whoops, let's not redefine the actual symbol.

  • Loading branch information
icculus committed Nov 3, 2012
1 parent 37fab69 commit f7a350c714f5be5d5c9ee9e2b9a106f591f12e07
Showing with 7 additions and 7 deletions.
  1. +7 −7 src/thread/pthread/SDL_systhread.c
@@ -72,10 +72,10 @@ RunThread(void *data)

#if defined(__MACOSX__) || defined(__IPHONEOS__)
static SDL_bool checked_setname = SDL_FALSE;
static int (*pthread_setname_np)(const char*) = NULL;
static int (*ppthread_setname_np)(const char*) = NULL;
#elif defined(__LINUX__)
static SDL_bool checked_setname = SDL_FALSE;
static int (*pthread_setname_np)(pthread_t, const char*) = NULL;
static int (*ppthread_setname_np)(pthread_t, const char*) = NULL;
#endif
int
SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
@@ -87,9 +87,9 @@ SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
if (!checked_setname) {
void *fn = dlsym(RTLD_DEFAULT, "pthread_setname_np");
#if defined(__MACOSX__) || defined(__IPHONEOS__)
pthread_setname_np = (int(*)(const char*)) fn;
ppthread_setname_np = (int(*)(const char*)) fn;
#elif defined(__LINUX__)
pthread_setname_np = (int(*)(pthread_t, const char*)) fn;
ppthread_setname_np = (int(*)(pthread_t, const char*)) fn;
#endif
checked_setname = SDL_TRUE;
}
@@ -120,11 +120,11 @@ SDL_SYS_SetupThread(const char *name)
if (name != NULL) {
#if defined(__MACOSX__) || defined(__IPHONEOS__) || defined(__LINUX__)
SDL_assert(checked_setname);
if (pthread_setname_np) {
if (ppthread_setname_np != NULL) {
#if defined(__MACOSX__) || defined(__IPHONEOS__)
pthread_setname_np(name);
ppthread_setname_np(name);
#elif defined(__LINUX__)
pthread_setname_np(pthread_self(), name);
ppthread_setname_np(pthread_self(), name);
#endif
}
#elif HAVE_PTHREAD_SETNAME_NP

0 comments on commit f7a350c

Please sign in to comment.