From 2616ec46f5b69e3452788394ba6d0e21232463cc Mon Sep 17 00:00:00 2001
From: Dmitry Lukianov <Dmitrorus@gmail.com>
Date: Sat, 5 Aug 2017 15:59:40 +0700
Subject: fixed macos build

---
 compat/nan.cpp                     |  5 +++++
 compat/timer.cpp                   |  2 +-
 qxt-mini/qxtglobalshortcut_mac.cpp | 12 ++++++------
 spline/spline.cpp                  |  2 ++
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/compat/nan.cpp b/compat/nan.cpp
index 9c7bf147..2659ad07 100644
--- a/compat/nan.cpp
+++ b/compat/nan.cpp
@@ -18,6 +18,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");
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;
diff --git a/qxt-mini/qxtglobalshortcut_mac.cpp b/qxt-mini/qxtglobalshortcut_mac.cpp
index 55684667..d7cd7f84 100644
--- a/qxt-mini/qxtglobalshortcut_mac.cpp
+++ b/qxt-mini/qxtglobalshortcut_mac.cpp
@@ -80,7 +80,7 @@ quint32 QxtGlobalShortcutPrivate::nativeKeycode(Qt::Key keys)
 {
     UTF16Char ch;
     // Constants found in NSEvent.h from AppKit.framework
-    switch (key)
+    switch (keys)
     {
     case Qt::Key_Return:
         return kVK_Return;
@@ -170,11 +170,11 @@ quint32 QxtGlobalShortcutPrivate::nativeKeycode(Qt::Key keys)
         ;
     }
 
-    if (key == Qt::Key_Escape)	ch = 27;
-    else if (key == Qt::Key_Return) ch = 13;
-    else if (key == Qt::Key_Enter) ch = 3;
-    else if (key == Qt::Key_Tab) ch = 9;
-    else ch = key;
+    if (keys == Qt::Key_Escape)	ch = 27;
+    else if (keys == Qt::Key_Return) ch = 13;
+    else if (keys == Qt::Key_Enter) ch = 3;
+    else if (keys == Qt::Key_Tab) ch = 9;
+    else ch = keys;
 
     CFDataRef currentLayoutData;
     TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource();
diff --git a/spline/spline.cpp b/spline/spline.cpp
index 624ab883..9d783df6 100644
--- a/spline/spline.cpp
+++ b/spline/spline.cpp
@@ -9,8 +9,10 @@
 #include "spline.hpp"
 
 #include <algorithm>
+#include <cstdlib>
 #include <cmath>
 #include <memory>
+#include <cinttypes>
 
 #include <QObject>
 #include <QMutexLocker>
-- 
cgit v1.2.3