diff options
| author | Markus Koschany <apo@gambaru.de> | 2015-01-20 10:41:51 +0100 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2015-02-11 15:59:58 +1000 |
| commit | cfca5f99e62a32b5488d93f771453ef6935c5d4e (patch) | |
| tree | 44f3e00e3f23f48648e066b70a8cdd41cdd8a08f /src/jthread/jsemaphore.h | |
| parent | caf8d2a9d16a313bbc86a27ad0642efc76852e9f (diff) | |
| download | minetest-cfca5f99e62a32b5488d93f771453ef6935c5d4e.tar.gz minetest-cfca5f99e62a32b5488d93f771453ef6935c5d4e.tar.bz2 minetest-cfca5f99e62a32b5488d93f771453ef6935c5d4e.zip | |
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.
Diffstat (limited to 'src/jthread/jsemaphore.h')
| -rw-r--r-- | src/jthread/jsemaphore.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 <windows.h> #include <assert.h> #define MAX_SEMAPHORE_COUNT 1024 -#elif __MACH__ +#elif defined(__MACH__) && defined(__APPLE__) #include <pthread.h> #include <mach/mach.h> #include <mach/task.h> @@ -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 |