瀏覽代碼

Fix Platform Thread Override

(cherry picked from commit 5fe1857496dedf6c43964b6253324eaaac22ac58)
Lucy 4 年之前
父節點
當前提交
1d3f1c8c0a
共有 2 個文件被更改,包括 7 次插入8 次删除
  1. 2 4
      core/os/thread.cpp
  2. 5 4
      core/os/thread.h

+ 2 - 4
core/os/thread.cpp

@@ -28,9 +28,7 @@
 /* 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
+#ifndef PLATFORM_THREAD_OVERRIDE // See details in thread.h
 
 #include "thread.h"
 
@@ -138,4 +136,4 @@ Thread::ID Thread::get_caller_id() {
 	}
 }
 #endif
-#endif // PLATFORM_CUSTOM_THREAD_H
+#endif // PLATFORM_THREAD_OVERRIDE

+ 5 - 4
core/os/thread.h

@@ -28,10 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-// Define PLATFORM_CUSTOM_THREAD_H in platform_config.h
+// Define PLATFORM_THREAD_OVERRIDE in your platform's `platform_config.h`
+// to use a custom Thread implementation defined in `platform/[your_platform]/platform_thread.h`
 // Overriding the platform implementation is required in some proprietary platforms
-#ifdef PLATFORM_CUSTOM_THREAD_H
-#include PLATFORM_CUSTOM_THREAD_H
+#ifdef PLATFORM_THREAD_OVERRIDE
+#include "platform_thread.h"
 #else
 #ifndef THREAD_H
 #define THREAD_H
@@ -119,4 +120,4 @@ public:
 };
 
 #endif // THREAD_H
-#endif // PLATFORM_CUSTOM_THREAD_H
+#endif // PLATFORM_THREAD_OVERRIDE