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

Merge pull request #52734 from lucypero/thread_override_master

Browse source
This commit is contained in:
Rémi Verschelde 2021-09-16 21:45:04 +02:00 committed by GitHub
commit 191c34eb0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/os/thread.cpp
View file

@ -28,6 +28,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
// Define PLATFORM_CUSTOM_THREAD_H in platform_config.h
// Overriding the platform implementation is required in some proprietary platforms
#ifndef PLATFORM_CUSTOM_THREAD_H
#include "thread.h" #include "thread.h"
#include "core/object/script_language.h" #include "core/object/script_language.h"
@ -126,3 +130,4 @@ Thread::~Thread() {
} }
#endif #endif
#endif // PLATFORM_CUSTOM_THREAD_H

6
core/os/thread.h
View file

@ -28,6 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
// Define PLATFORM_CUSTOM_THREAD_H in platform_config.h
// Overriding the platform implementation is required in some proprietary platforms
#ifdef PLATFORM_CUSTOM_THREAD_H
#include PLATFORM_CUSTOM_THREAD_H
#else
#ifndef THREAD_H #ifndef THREAD_H
#define THREAD_H #define THREAD_H
@ -116,3 +121,4 @@ public:
}; };
#endif // THREAD_H #endif // THREAD_H
#endif // PLATFORM_CUSTOM_THREAD_H