From cfca5f99e62a32b5488d93f771453ef6935c5d4e Mon Sep 17 00:00:00 2001 From: Markus Koschany Date: Tue, 20 Jan 2015 10:41:51 +0100 Subject: Fix FTBFS on GNU/Hurd platform Minetest fails to build on GNU/Hurd due to a name clash with OSX/Apple, both are defining the __MACH__ keyword. This commit fixes the issue. --- src/jthread/jsemaphore.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/jthread/jsemaphore.h') diff --git a/src/jthread/jsemaphore.h b/src/jthread/jsemaphore.h index 4ab006aea..32e9bc2f2 100644 --- a/src/jthread/jsemaphore.h +++ b/src/jthread/jsemaphore.h @@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #define MAX_SEMAPHORE_COUNT 1024 -#elif __MACH__ +#elif defined(__MACH__) && defined(__APPLE__) #include #include #include @@ -52,7 +52,7 @@ public: private: #if defined(WIN32) HANDLE m_hSemaphore; -#elif __MACH__ +#elif defined(__MACH__) && defined(__APPLE__) semaphore_t m_semaphore; int semcount; #else -- cgit v1.2.3