diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2015-04-07 06:13:12 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2015-08-23 22:04:06 -0400 |
| commit | e4bff8be94c0db4f94e63ad448d0eeb869ccdbbd (patch) | |
| tree | 7935586e79da5c8c7144e345a8c0fc1cda53beed /src/threads.h | |
| parent | 6a1047d8c116f793890b63427d53f04ceca95d54 (diff) | |
| download | minetest-e4bff8be94c0db4f94e63ad448d0eeb869ccdbbd.tar.gz minetest-e4bff8be94c0db4f94e63ad448d0eeb869ccdbbd.tar.bz2 minetest-e4bff8be94c0db4f94e63ad448d0eeb869ccdbbd.zip | |
Clean up threading
* Rename everything.
* Strip J prefix.
* Change UpperCamelCase functions to lowerCamelCase.
* Remove global (!) semaphore count mutex on OSX.
* Remove semaphore count getter (unused, unsafe, depended on internal
API functions on Windows, and used a hack on OSX).
* Add `Atomic<type>`.
* Make `Thread` handle thread names.
* Add support for C++11 multi-threading.
* Combine pthread and win32 sources.
* Remove `ThreadStarted` (unused, unneeded).
* Move some includes from the headers to the sources.
* Move all of `Event` into its header (allows inlining with no new includes).
* Make `Event` use `Semaphore` (except on Windows).
* Move some porting functions into `Thread`.
* Integrate logging with `Thread`.
* Add threading test.
Diffstat (limited to 'src/threads.h')
| -rw-r--r-- | src/threads.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/threads.h b/src/threads.h index 503fa6abf..bc3bf571d 100644 --- a/src/threads.h +++ b/src/threads.h @@ -20,9 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef THREADS_HEADER #define THREADS_HEADER -#include "jthread/jmutex.h" +#include "threading/mutex.h" -#if (defined(WIN32) || defined(_WIN32_WCE)) +#if defined(WIN32) || defined(_WIN32_WCE) typedef DWORD threadid_t; #else typedef pthread_t threadid_t; @@ -30,7 +30,7 @@ typedef pthread_t threadid_t; inline threadid_t get_current_thread_id() { -#if (defined(WIN32) || defined(_WIN32_WCE)) +#if defined(WIN32) || defined(_WIN32_WCE) return GetCurrentThreadId(); #else return pthread_self(); |