diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-31 15:24:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-31 15:24:56 +0100 |
| commit | 5525cd85c60455b0bb9716bbef0ad2ad8111d752 (patch) | |
| tree | 52ff0e2d3e01dd2655feff1cf88f07e10d84aad1 /drivers/unix/os_unix.cpp | |
| parent | 02eb11450b4151b02db861b5029783e52e16c603 (diff) | |
| parent | 99fe462452be44efa618e83ad9bbecd722ae6ecd (diff) | |
Merge pull request #45315 from RandomShaper/modernize_thread
Modernize Thread
Diffstat (limited to 'drivers/unix/os_unix.cpp')
| -rw-r--r-- | drivers/unix/os_unix.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 36560eb736..b9bd773c2e 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -35,7 +35,6 @@ #include "core/config/project_settings.h" #include "core/debugger/engine_debugger.h" #include "core/debugger/script_debugger.h" -#include "core/os/thread_dummy.h" #include "drivers/unix/dir_access_unix.h" #include "drivers/unix/file_access_unix.h" #include "drivers/unix/net_socket_posix.h" @@ -63,6 +62,7 @@ #include <string.h> #include <sys/time.h> #include <sys/wait.h> +#include <time.h> #include <unistd.h> /// Clock Setup function (used by get_ticks_usec) @@ -116,11 +116,10 @@ int OS_Unix::unix_initialize_audio(int p_audio_driver) { } void OS_Unix::initialize_core() { -#ifdef NO_THREADS - ThreadDummy::make_default(); -#else - ThreadPosix::make_default(); +#if !defined(NO_THREADS) + init_thread_posix(); #endif + FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_RESOURCES); FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_USERDATA); FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_FILESYSTEM); |