Merge pull request #668 from MrCapone/macos_build_fix

fixed macos build

2 files changed, 6 insertions, 1 deletions

diff --git a/compat/nan.cpp b/compat/nan.cpp
index 9c7bf147..2659ad07 100644
--- a/compat/nan.cpp
+++ b/compat/nan.cpp
@@ -19,6 +19,11 @@ int __cdecl my_fpclassify(double)__asm__("___fpclassify");
 #define my_isinf(x) (my_fpclassify(x) == FP_INFINITE)
 
 extern "C" OTR_COMPAT_EXPORT bool __attribute__ ((noinline)) nanp(double x)
+#elif defined __APPLE__
+#   include <math.h>
+#   define my_isnan(x) isnan(x)
+#   define my_isinf(x) isinf(x)
+extern "C" OTR_COMPAT_EXPORT bool __attribute__ ((noinline)) nanp(double x)
 #else
 int my_isnan(double)__asm__("isnan");
 int my_isinf(double)__asm__("isinf");
diff --git a/compat/timer.cpp b/compat/timer.cpp
index ca22fa10..ff08c3d5 100644
--- a/compat/timer.cpp
+++ b/compat/timer.cpp
@@ -109,7 +109,7 @@ mach_timebase_info_data_t Timer::otr_get_mach_frequency()
     return timebase_info;
 }
 
-double Timer::otr_clock_gettime(timespec* ts)
+void Timer::otr_clock_gettime(timespec* ts)
 {
     static const mach_timebase_info_data_t timebase_info = otr_get_mach_frequency();
     uint64_t state, nsec;