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/porting.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/porting.h')
| -rw-r--r-- | src/porting.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/porting.h b/src/porting.h index 8387453e8..3d2677564 100644 --- a/src/porting.h +++ b/src/porting.h @@ -60,7 +60,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <unistd.h> #include <stdint.h> //for uintptr_t - #if (defined(linux) || defined(__linux)) && !defined(_GNU_SOURCE) +#if (defined(linux) || defined(__linux) || defined(__GNU__)) && !defined(_GNU_SOURCE) #define _GNU_SOURCE #endif @@ -228,7 +228,7 @@ void initIrrlicht(irr::IrrlichtDevice * ); #else // Posix #include <sys/time.h> #include <time.h> -#ifdef __MACH__ +#if defined(__MACH__) && defined(__APPLE__) #include <mach/clock.h> #include <mach/mach.h> #endif @@ -258,7 +258,7 @@ void initIrrlicht(irr::IrrlichtDevice * ); { struct timespec ts; // from http://stackoverflow.com/questions/5167269/clock-gettime-alternative-in-mac-os-x -#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time +#if defined(__MACH__) && defined(__APPLE__) // OS X does not have clock_gettime, use clock_get_time clock_serv_t cclock; mach_timespec_t mts; host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); @@ -358,7 +358,7 @@ inline u32 getDeltaMs(u32 old_time_ms, u32 new_time_ms) inline void setThreadName(const char *name) { pthread_setname_np(name); } -#elif defined(_WIN32) +#elif defined(_WIN32) || defined(__GNU__) inline void setThreadName(const char* name) {} #else #warning "Unrecognized platform, thread names will not be available." |