Fix warnings reported by clang

[oweals/minetest.git] / src / threads.h

diff --git a/src/threads.h b/src/threads.h
index 2ffc5eb1b15c21fa29d35cec119b043e5f9ede0e..503fa6abf32f3fa6d9d2f1f1d9e2117f50ca3e88 100644 (file)
--- a/src/threads.h
+++ b/src/threads.h
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -20,16 +20,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef THREADS_HEADER
 #define THREADS_HEADER
 
-#include <jmutex.h>
+#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()