diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-09-29 22:43:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 22:43:06 +0200 |
| commit | 4028583e8105612efbb71d9a94a833bf7e1302f1 (patch) | |
| tree | 8c5ed61ab930324f02e227b0a375d7e78808d981 | |
| parent | 2fc31fdfca29753977b36180e6aab9c28e84cddc (diff) | |
| parent | 5fe1857496dedf6c43964b6253324eaaac22ac58 (diff) | |
Merge pull request #53044 from lucypero/thread_override
| -rw-r--r-- | core/os/thread.cpp | 6 | ||||
| -rw-r--r-- | core/os/thread.h | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/core/os/thread.cpp b/core/os/thread.cpp index 92e43963d2..27aefc98de 100644 --- a/core/os/thread.cpp +++ b/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" @@ -130,4 +128,4 @@ Thread::~Thread() { } #endif -#endif // PLATFORM_CUSTOM_THREAD_H +#endif // PLATFORM_THREAD_OVERRIDE diff --git a/core/os/thread.h b/core/os/thread.h index 3a0938c7f7..59cb58ac57 100644 --- a/core/os/thread.h +++ b/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 @@ -121,4 +122,4 @@ public: }; #endif // THREAD_H -#endif // PLATFORM_CUSTOM_THREAD_H +#endif // PLATFORM_THREAD_OVERRIDE |