From f82895501f1c5355816db8dcdec1bcee5ccd6566 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Sun, 21 Feb 2016 22:57:02 +0100
Subject: [PATCH] Fix build on Mac OS X El Capitan (10.11)

---
 mkspecs/features/common_pre.prf   | 1 +
 src/blackinput/osx/keyboardmac.h  | 9 +--------
 src/blackinput/osx/keyboardmac.mm | 3 +--
 src/blackmisc/math/mathutils.cpp  | 1 +
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/mkspecs/features/common_pre.prf b/mkspecs/features/common_pre.prf
index 80cdb5ae5..52d7f0449 100644
--- a/mkspecs/features/common_pre.prf
+++ b/mkspecs/features/common_pre.prf
@@ -134,6 +134,7 @@ equals(WORD_SIZE,64): EXTERNALSDIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib64
 equals(WORD_SIZE,32): EXTERNALSDIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib32
 
 LIBS *= -L$$EXTERNALSDIR
+macx: LIBS *= -F$$EXTERNALSDIR
 win32: LIBS *= -luser32
 
 INCLUDEPATH *= $$EXTERNALDIR/common/include
diff --git a/src/blackinput/osx/keyboardmac.h b/src/blackinput/osx/keyboardmac.h
index b40dff6fd..2a389b4bb 100644
--- a/src/blackinput/osx/keyboardmac.h
+++ b/src/blackinput/osx/keyboardmac.h
@@ -14,16 +14,9 @@
 
 #include "blackinput/keyboard.h"
 #include "blackmisc/input/hotkeycombination.h"
+#include <ApplicationServices/ApplicationServices.h>
 #include <QHash>
 
-class __CGEvent;
-
-typedef __CGEvent* CGEventRef; //!< Mac event definition
-typedef unsigned int CGEventType; //!< Max event type definition
-
-class __CGEventTapProxy;
-typedef __CGEventTapProxy* CGEventTapProxy; //!< Max event proxy definition
-
 namespace BlackInput
 {
     //! Mac OSX implemenation of IKeyboard using hook procedure
diff --git a/src/blackinput/osx/keyboardmac.mm b/src/blackinput/osx/keyboardmac.mm
index 53f91bf1b..895a98d56 100644
--- a/src/blackinput/osx/keyboardmac.mm
+++ b/src/blackinput/osx/keyboardmac.mm
@@ -11,7 +11,6 @@
 #include <QHash>
 #include <QtWidgets/QMessageBox>
 #include <CoreFoundation/CoreFoundation.h>
-#include <ApplicationServices/ApplicationServices.h>
 #include <AppKit/NSEvent.h>
 #include <AppKit/NSAlert.h>
 #include <Foundation/NSString.h>
@@ -110,7 +109,7 @@ namespace BlackInput
         CGEventMask eventMask = ((1 << kCGEventKeyDown) | (1 << kCGEventKeyUp) | (1 << kCGEventFlagsChanged));
 
         // try creating an event tap just for keypresses. if it fails, we need Universal Access.
-        CFMachPortRef eventTap = CGEventTapCreate(kCGHIDEventTap, kCGHeadInsertEventTap, 0,
+        CFMachPortRef eventTap = CGEventTapCreate(kCGHIDEventTap, kCGHeadInsertEventTap, kCGEventTapOptionDefault,
                                  eventMask, myCGEventCallback, this);
 
         CFRunLoopSourceRef source = CFMachPortCreateRunLoopSource(kCFAllocatorDefault,
diff --git a/src/blackmisc/math/mathutils.cpp b/src/blackmisc/math/mathutils.cpp
index 70ab33e3f..21857c7a3 100644
--- a/src/blackmisc/math/mathutils.cpp
+++ b/src/blackmisc/math/mathutils.cpp
@@ -12,6 +12,7 @@
 #include <QTime>
 #include <algorithm>
 #include <cmath>
+#include <cstdlib>
 
 namespace BlackMisc
 {