Merge pull request #52734 from lucypero/thread_override_master

godotengine · Sep 16, 2021 · 191c34e · 191c34e
2 parents 3581b89 + e9723ef
commit 191c34e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git 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
@@ -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 @@ class Thread {
 };
 
 #endif // THREAD_H
+#endif // PLATFORM_CUSTOM_THREAD_H