diff options
| author | Markus Koschany <apo@gambaru.de> | 2015-01-20 10:41:51 +0100 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2015-02-14 20:59:35 +1000 |
| commit | 93e5ab367abe9f68cf1fe3ed8a198f563d9452af (patch) | |
| tree | f617bb7a04a694905ac63683058c9fe4d494d59b /src/jthread/jevent.h | |
| parent | 60fa5807b90498bf052bce1a7552f2ec794eb0d4 (diff) | |
| download | minetest-93e5ab367abe9f68cf1fe3ed8a198f563d9452af.tar.gz minetest-93e5ab367abe9f68cf1fe3ed8a198f563d9452af.tar.bz2 minetest-93e5ab367abe9f68cf1fe3ed8a198f563d9452af.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/jevent.h')
| -rw-r--r-- | src/jthread/jevent.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jthread/jevent.h b/src/jthread/jevent.h index f97e09ca0..9ea7ebde8 100644 --- a/src/jthread/jevent.h +++ b/src/jthread/jevent.h @@ -30,7 +30,7 @@ #ifdef _WIN32 #include <windows.h> -#elif __MACH__ +#elif defined(__MACH__) && defined(__APPLE__) #include <mach/mach.h> #include <mach/task.h> #include <mach/semaphore.h> @@ -43,7 +43,7 @@ class Event { #ifdef _WIN32 HANDLE hEvent; -#elif __MACH__ +#elif defined(__MACH__) && defined(__APPLE__) semaphore_t sem; #else sem_t sem; |