diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-09-16 21:45:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-16 21:45:04 +0200 |
| commit | 191c34eb0d0d66fc6b5aac7d7f281fbd76171cd4 (patch) | |
| tree | fe0477c72daf1a70ccac97c15eeffd0fa438c365 /core/os | |
| parent | 3581b893ed2dc1e444618ac40dc26dd58fe1219a (diff) | |
| parent | e9723efd34a3edc018cf48519b3753890fd3aebf (diff) | |
Merge pull request #52734 from lucypero/thread_override_master
Diffstat (limited to 'core/os')
| -rw-r--r-- | core/os/thread.cpp | 5 | ||||
| -rw-r--r-- | core/os/thread.h | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/core/os/thread.cpp b/core/os/thread.cpp index 73e31bdb3d..92e43963d2 100644 --- a/core/os/thread.cpp +++ b/core/os/thread.cpp @@ -28,6 +28,10 @@ /* 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 "core/object/script_language.h" @@ -126,3 +130,4 @@ Thread::~Thread() { } #endif +#endif // PLATFORM_CUSTOM_THREAD_H diff --git a/core/os/thread.h b/core/os/thread.h index 17ac82c650..3a0938c7f7 100644 --- a/core/os/thread.h +++ b/core/os/thread.h @@ -28,6 +28,11 @@ /* 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 #define THREAD_H @@ -116,3 +121,4 @@ public: }; #endif // THREAD_H +#endif // PLATFORM_CUSTOM_THREAD_H |