diff options
author | Perttu Ahola <celeron55@gmail.com> | 2010-12-20 22:03:49 +0200 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2010-12-20 22:03:49 +0200 |
commit | 123e8fdf53ffb40c7464d0559a49e048fed79d7d (patch) | |
tree | 98df766999e684e46629bfa886195427adda2967 /src/debug.h | |
parent | 6350c5d7a606924a12ba41468d126ff94d9e6d36 (diff) | |
download | minetest-123e8fdf53ffb40c7464d0559a49e048fed79d7d.tar.gz minetest-123e8fdf53ffb40c7464d0559a49e048fed79d7d.tar.bz2 minetest-123e8fdf53ffb40c7464d0559a49e048fed79d7d.zip |
framework for modifying textures
Diffstat (limited to 'src/debug.h')
-rw-r--r-- | src/debug.h | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/debug.h b/src/debug.h index 9a2e282f5..44fcf4b51 100644 --- a/src/debug.h +++ b/src/debug.h @@ -30,29 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <jmutexautolock.h> #include <iostream> #include "common_irrlicht.h" - -/* - Compatibility stuff -*/ - -#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() -{ -#if (defined(WIN32) || defined(_WIN32_WCE)) - return GetCurrentThreadId(); -#else - return pthread_self(); -#endif -} +#include "threads.h" /* Debug output |