diff options
| author | Wolfgang Hommel <wolfgang.hommel@unibw.de> | 2016-10-30 13:25:38 +0100 |
|---|---|---|
| committer | Wolfgang Hommel <wolfgang.hommel@unibw.de> | 2016-10-30 13:25:38 +0100 |
| commit | 8fb6330a28a99992ab7adbfa28c491f9baff4186 (patch) | |
| tree | a8a781eefbebabb284b9b7ffe1b201e00976162c | |
| parent | da778084e5c5d923a0fbf1b95a60eadb56acb8b0 (diff) | |
| download | libfaketime-macos-sierra.tar.gz | |
Fixes compilation issues on macOS Sierramacos-sierra
| -rw-r--r-- | src/libfaketime.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/libfaketime.c b/src/libfaketime.c index 617dd25..a456df9 100644 --- a/src/libfaketime.c +++ b/src/libfaketime.c @@ -63,9 +63,13 @@ extern char *__progname; #endif #else /* endianness related macros */ +#define OSSwapHostToBigInt64(x) ((uint64_t)(x)) #define htobe64(x) OSSwapHostToBigInt64(x) +#define OSSwapHostToLittleInt64(x) OSSwapInt64(x) #define htole64(x) OSSwapHostToLittleInt64(x) +#define OSSwapBigToHostInt64(x) ((uint64_t)(x)) #define be64toh(x) OSSwapBigToHostInt64(x) +#define OSSwapLittleToHostInt64(x) OSSwapInt64(x) #define le64toh(x) OSSwapLittleToHostInt64(x) /* clock_gettime() and related clock definitions are missing on __APPLE__ */ @@ -128,7 +132,7 @@ static int (*real___ftime) (struct timeb *); static int (*real___gettimeofday) (struct timeval *, void *); static int (*real___clock_gettime) (clockid_t clk_id, struct timespec *tp); #endif -#ifndef __APPLE__ +#ifndef __APPLEOSX__ #ifdef FAKE_TIMERS static int (*real_timer_settime_22) (int timerid, int flags, const struct itimerspec *new_value, struct itimerspec * old_value); @@ -150,7 +154,7 @@ static int (*real_poll) (struct pollfd *, nfds_t, int); static int (*real_ppoll) (struct pollfd *, nfds_t, const struct timespec *, const sigset_t *); static int (*real_sem_timedwait) (sem_t*, const struct timespec*); #endif -#ifdef __APPLE__ +#ifdef __APPLEOSX__ static int (*real_clock_get_time) (clock_serv_t clock_serv, mach_timespec_t *cur_timeclockid_t); static int apple_clock_gettime (clockid_t clk_id, struct timespec *tp); static clock_serv_t clock_serv_real; @@ -306,7 +310,7 @@ void ft_cleanup (void) /* Get system time from system for all clocks */ static void system_time_from_system (struct system_time_s * systime) { -#ifdef __APPLE__ +#ifdef __APPLEOSX__ /* from http://stackoverflow.com/questions/5167269/clock-gettime-alternative-in-mac-os-x */ clock_serv_t cclock; mach_timespec_t mts; @@ -1600,7 +1604,7 @@ void ftpl_init(void) real___gettimeofday = dlsym(RTLD_NEXT, "__gettimeofday"); real___clock_gettime = dlsym(RTLD_NEXT, "__clock_gettime"); #endif -#ifdef __APPLE__ +#ifdef __APPLEOSX__ real_clock_get_time = dlsym(RTLD_NEXT, "clock_get_time"); real_clock_gettime = apple_clock_gettime; #else @@ -2134,7 +2138,7 @@ int fake_gettimeofday(struct timeval *tv) * ======================================================================= */ -#ifdef __APPLE__ +#ifdef __APPLEOSX__ /* * clock_gettime implementation for __APPLE__ * @note It always behave like being called with CLOCK_REALTIME. |