diff options
| author | Rémi Verschelde | 2018-03-21 17:40:01 +0100 |
|---|---|---|
| committer | GitHub | 2018-03-21 17:40:01 +0100 |
| commit | baa092e99dc0dcf39362c4ce7086ea92095f9224 (patch) | |
| tree | 9d59f39eeabc55feaae171cbb292d5bed2c64467 /drivers | |
| parent | b384bf6fbccd831f597ce8342df32b57485ed656 (diff) | |
| parent | 25800ffb0e9acfe9e63608eb44979f27c33fc6c1 (diff) | |
| download | godot-baa092e99dc0dcf39362c4ce7086ea92095f9224.tar.gz godot-baa092e99dc0dcf39362c4ce7086ea92095f9224.tar.zst godot-baa092e99dc0dcf39362c4ce7086ea92095f9224.zip | |
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/unix/os_unix.cpp | 3 | ||||
| -rw-r--r-- | drivers/unix/thread_posix.cpp | 2 | ||||
| -rw-r--r-- | drivers/unix/thread_posix.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 20722557e..31c8e4ade 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -89,10 +89,11 @@ void handle_sigchld(int sig) { void OS_Unix::initialize_core() { -#ifdef NO_PTHREADS +#ifdef NO_THREADS ThreadDummy::make_default(); SemaphoreDummy::make_default(); MutexDummy::make_default(); + RWLockDummy::make_default(); #else ThreadPosix::make_default(); SemaphorePosix::make_default(); diff --git a/drivers/unix/thread_posix.cpp b/drivers/unix/thread_posix.cpp index f079ae2ae..a73b40a6f 100644 --- a/drivers/unix/thread_posix.cpp +++ b/drivers/unix/thread_posix.cpp @@ -31,7 +31,7 @@ #include "thread_posix.h" #include "script_language.h" -#if defined(UNIX_ENABLED) || defined(PTHREAD_ENABLED) +#if (defined(UNIX_ENABLED) || defined(PTHREAD_ENABLED)) && !defined(NO_THREADS) #ifdef PTHREAD_BSD_SET_NAME #include <pthread_np.h> diff --git a/drivers/unix/thread_posix.h b/drivers/unix/thread_posix.h index 15c9265e6..ea2de61bd 100644 --- a/drivers/unix/thread_posix.h +++ b/drivers/unix/thread_posix.h @@ -35,7 +35,7 @@ @author Juan Linietsky <reduzio@gmail.com> */ -#if defined(UNIX_ENABLED) || defined(PTHREAD_ENABLED) +#if (defined(UNIX_ENABLED) || defined(PTHREAD_ENABLED)) && !defined(NO_THREADS) #include "os/thread.h" #include <pthread.h> |