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

NetBSD: fixed issues with cpuinfo and pthread_setname_np (thanks, Thomas!). 

Fixes Bugzilla #3176.
This commit is contained in:
Ryan C. Gordon 2015-12-29 02:32:47 -05:00
parent ce0f90ffb9
commit 696cd7975c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpuinfo/SDL_cpuinfo.c
View File

@ -735,7 +735,7 @@ SDL_GetSystemRAM(void)
#endif #endif
#ifdef HAVE_SYSCTLBYNAME #ifdef HAVE_SYSCTLBYNAME
if (SDL_SystemRAM <= 0) { if (SDL_SystemRAM <= 0) {
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
#ifdef HW_REALMEM #ifdef HW_REALMEM
int mib[2] = {CTL_HW, HW_REALMEM}; int mib[2] = {CTL_HW, HW_REALMEM};
#else #else

4
src/thread/pthread/SDL_systhread.c
View File

@ -143,7 +143,11 @@ SDL_SYS_SetupThread(const char *name)
#endif #endif
} }
#elif HAVE_PTHREAD_SETNAME_NP #elif HAVE_PTHREAD_SETNAME_NP
#if defined(__NETBSD__)
pthread_setname_np(pthread_self(), "%s", name);
#else
pthread_setname_np(pthread_self(), name); pthread_setname_np(pthread_self(), name);
#endif
#elif HAVE_PTHREAD_SET_NAME_NP #elif HAVE_PTHREAD_SET_NAME_NP
pthread_set_name_np(pthread_self(), name); pthread_set_name_np(pthread_self(), name);
#elif defined(__HAIKU__) #elif defined(__HAIKU__)