X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fthreads.h;h=503fa6abf32f3fa6d9d2f1f1d9e2117f50ca3e88;hb=37b7f094e3ea502339794f64e8bad22444c6fb54;hp=a3717a1def6a521937043f7b6c2fb48fda5e267b;hpb=22e186b4aa88b585e71500c4e9a03bf69b0b6191;p=oweals%2Fminetest.git diff --git a/src/threads.h b/src/threads.h index a3717a1de..503fa6abf 100644 --- a/src/threads.h +++ b/src/threads.h @@ -20,16 +20,12 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef THREADS_HEADER #define THREADS_HEADER -#include +#include "jthread/jmutex.h" #if (defined(WIN32) || defined(_WIN32_WCE)) typedef DWORD threadid_t; -#define __NORETURN __declspec(noreturn) -#define __FUNCTION_NAME __FUNCTION__ #else typedef pthread_t threadid_t; -#define __NORETURN __attribute__ ((__noreturn__)) -#define __FUNCTION_NAME __PRETTY_FUNCTION__ #endif inline threadid_t get_current_thread_id()