godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix pthread renaming in Open/FreeBSD

This commit is contained in:
eska 2016-01-09 15:56:31 +01:00
parent 9e143a52ba
commit a6c1a5c6d0
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/unix/thread_posix.cpp
View File

@ -30,6 +30,10 @@
#if defined(UNIX_ENABLED) || defined(PTHREAD_ENABLED)
#ifdef PTHREAD_BSD_SET_NAME
#include <pthread_np.h>
#endif
#include "os/memory.h"
Thread::ID ThreadPosix::get_ID() const {
@ -100,9 +104,14 @@ Error ThreadPosix::set_name(const String& p_name) {
#else
#ifdef PTHREAD_BSD_SET_NAME
pthread_set_name_np(pthread, p_name.utf8().get_data());
int err = 0; // Open/FreeBSD ignore errors in this function
#else
int err = pthread_setname_np(pthread, p_name.utf8().get_data());
#endif // PTHREAD_BSD_SET_NAME
#endif
#endif // PTHREAD_RENAME_SELF
return err == 0 ? OK : ERR_INVALID_PARAMETER;

1
platform/x11/platform_config.h
View File

@ -31,6 +31,7 @@
#endif
#if defined(__FreeBSD__) || defined(__OpenBSD__)
#include <stdlib.h>
#define PTHREAD_BSD_SET_NAME
#endif
#define GLES2_INCLUDE_H "gl_context/glew.h"