projects
/
oweals
/
minetest.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8b1f8e9
)
Fix prepreprocessor error in thread.h (related to C++11 threads)
author
Craig Robbins
<kde.psych@gmail.com>
Sat, 30 Apr 2016 02:29:52 +0000
(12:29 +1000)
committer
Craig Robbins
<kde.psych@gmail.com>
Sat, 30 Apr 2016 02:29:52 +0000
(12:29 +1000)
src/threading/thread.h
patch
|
blob
|
history
diff --git
a/src/threading/thread.h
b/src/threading/thread.h
index 10732c44201ab7171a79d48769fc7db15a25d073..de800ecb7e14359ea370bd67cd09fbcfb4ec6c0b 100644
(file)
--- a/
src/threading/thread.h
+++ b/
src/threading/thread.h
@@
-157,11
+157,11
@@
private:
Atomic<bool> m_running;
Mutex m_mutex;
-#if
!
USE_CPP11_THREADS
+#if
ndef
USE_CPP11_THREADS
threadhandle_t m_thread_handle;
-#if _WIN32
- threadid_t m_thread_id;
-#endif
+#
if _WIN32
+
threadid_t m_thread_id;
+#
endif
#endif
static ThreadStartFunc threadProc;