asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

threads

Browse source
This commit is contained in:
Ariel Manzur 2015-12-22 10:07:35 -03:00
parent 50e9839089
commit 02d6669a38
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/unix/thread_posix.cpp
View file

@ -81,6 +81,11 @@ Error ThreadPosix::set_name(const String& p_name) {
ERR_FAIL_COND_V(pthread == 0, ERR_UNCONFIGURED); ERR_FAIL_COND_V(pthread == 0, ERR_UNCONFIGURED);
#ifdef PTHREAD_NO_RENAME
return ERR_UNAVAILABLE;
#else
#ifdef PTHREAD_RENAME_SELF #ifdef PTHREAD_RENAME_SELF
// check if thread is the same as caller // check if thread is the same as caller
@ -100,6 +105,8 @@ Error ThreadPosix::set_name(const String& p_name) {
#endif #endif
return err == 0 ? OK : ERR_INVALID_PARAMETER; return err == 0 ? OK : ERR_INVALID_PARAMETER;
#endif // PTHREAD_NO_RENAME
}; };
void ThreadPosix::make_default() { void ThreadPosix::make_default() {

2
platform/javascript/detect.py
View file

@ -80,7 +80,7 @@ def configure(env):
env.opus_fixed_point="yes" env.opus_fixed_point="yes"
env.Append(CPPFLAGS=["-fno-exceptions",'-DNO_SAFE_CAST','-fno-rtti']) env.Append(CPPFLAGS=["-fno-exceptions",'-DNO_SAFE_CAST','-fno-rtti'])
env.Append(CPPFLAGS=['-DJAVASCRIPT_ENABLED', '-DUNIX_ENABLED', '-DNO_FCNTL','-DMPC_FIXED_POINT','-DTYPED_METHOD_BIND','-DNO_THREADS']) env.Append(CPPFLAGS=['-DJAVASCRIPT_ENABLED', '-DUNIX_ENABLED', '-DPTHREAD_NO_RENAME', '-DNO_FCNTL','-DMPC_FIXED_POINT','-DTYPED_METHOD_BIND','-DNO_THREADS'])
env.Append(CPPFLAGS=['-DGLES2_ENABLED']) env.Append(CPPFLAGS=['-DGLES2_ENABLED'])
env.Append(CPPFLAGS=['-DGLES_NO_CLIENT_ARRAYS']) env.Append(CPPFLAGS=['-DGLES_NO_CLIENT_ARRAYS'])
env.Append(CPPFLAGS=['-s','ASM_JS=1']) env.Append(CPPFLAGS=['-s','ASM_JS=1'])