X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fthreads.h;h=503fa6abf32f3fa6d9d2f1f1d9e2117f50ca3e88;hb=dec8c43de3afdbd2e257a031f5e053e7f1e74aa0;hp=1ea7d0a94c4678a5d88d6e0d96372ec73c782c3c;hpb=d5a78c12530df800f8182f7012cd16237a7ebafe;p=oweals%2Fminetest.git diff --git a/src/threads.h b/src/threads.h index 1ea7d0a94..503fa6abf 100644 --- a/src/threads.h +++ b/src/threads.h @@ -1,18 +1,18 @@ /* -Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GNU Lesser General Public License for more details. -You should have received a copy of the GNU General Public License along +You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -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()