From 600bebe38d48e5a3ef5aa8c5a3066e4c156f2200 Mon Sep 17 00:00:00 2001
From: Stephane Letz <letz@grame.fr>
Date: Mon, 5 Oct 2015 21:21:49 +0200
Subject: [PATCH] Missing include, correct log message.

---
 common/JackShmMem.h                    | 14 +++++++-------
 macosx/coremidi/JackCoreMidiDriver.cpp |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/common/JackShmMem.h b/common/JackShmMem.h
index da09c6c5..ceb76910 100644
--- a/common/JackShmMem.h
+++ b/common/JackShmMem.h
@@ -156,7 +156,7 @@ class JackShmReadWritePtr
         void Init(int index, const char* server_name = JACK_DEFAULT_SERVER_NAME)
         {
             if (fInfo.index < 0 && index >= 0) {
-                jack_log("JackShmReadWritePtr::Init %ld %ld", index, fInfo.index);
+                jack_log("JackShmReadWritePtr::Init %ld %d", index, fInfo.index);
                 if (jack_initialize_shm(server_name) < 0) {
                     throw std::bad_alloc();
                 }
@@ -186,11 +186,11 @@ class JackShmReadWritePtr
         ~JackShmReadWritePtr()
         {
             if (!fInitDone) {
-               jack_error("JackShmReadWritePtr::~JackShmReadWritePtr - Init not done for %ld, skipping unlock", fInfo.index);                              
+               jack_error("JackShmReadWritePtr::~JackShmReadWritePtr - Init not done for %d, skipping unlock", fInfo.index);                              
                return;
             }
             if (fInfo.index >= 0) {
-                jack_log("JackShmReadWritePtr::~JackShmReadWritePtr %ld", fInfo.index);
+                jack_log("JackShmReadWritePtr::~JackShmReadWritePtr %d", fInfo.index);
                 GetShmAddress()->UnlockMemory();
                 jack_release_lib_shm(&fInfo);
                 fInfo.index = -1;
@@ -245,7 +245,7 @@ class JackShmReadWritePtr1
         void Init(int index, const char* server_name = JACK_DEFAULT_SERVER_NAME)
         {
             if (fInfo.index < 0 && index >= 0) {
-                jack_log("JackShmReadWritePtr1::Init %ld %ld", index, fInfo.index);
+                jack_log("JackShmReadWritePtr1::Init %ld %d", index, fInfo.index);
                 if (jack_initialize_shm(server_name) < 0) {
                     throw std::bad_alloc();
                 }
@@ -281,11 +281,11 @@ class JackShmReadWritePtr1
         ~JackShmReadWritePtr1()
         {
             if (!fInitDone) {
-               jack_error("JackShmReadWritePtr1::~JackShmReadWritePtr1 - Init not done for %ld, skipping unlock", fInfo.index);                              
+               jack_error("JackShmReadWritePtr1::~JackShmReadWritePtr1 - Init not done for %d, skipping unlock", fInfo.index);                              
                return;
             }
             if (fInfo.index >= 0) {
-                jack_log("JackShmReadWritePtr1::~JackShmReadWritePtr1 %ld", fInfo.index);
+                jack_log("JackShmReadWritePtr1::~JackShmReadWritePtr1 %d", fInfo.index);
                 GetShmAddress()->UnlockMemory();
                 jack_release_lib_shm(&fInfo);
                 fInfo.index = -1;
@@ -340,7 +340,7 @@ class JackShmReadPtr
         void Init(int index, const char* server_name = JACK_DEFAULT_SERVER_NAME)
         {
             if (fInfo.index < 0 && index >= 0) {
-                jack_log("JackShmPtrRead::Init %ld %ld", index, fInfo.index);
+                jack_log("JackShmPtrRead::Init %ld %d", index, fInfo.index);
                 if (jack_initialize_shm(server_name) < 0) {
                     throw std::bad_alloc();
                 }
diff --git a/macosx/coremidi/JackCoreMidiDriver.cpp b/macosx/coremidi/JackCoreMidiDriver.cpp
index b4ce204c..16912ab6 100644
--- a/macosx/coremidi/JackCoreMidiDriver.cpp
+++ b/macosx/coremidi/JackCoreMidiDriver.cpp
@@ -26,6 +26,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include <stdexcept>
 #include <mach/mach_time.h>
+#include <mach/mach_error.h>
 
 using Jack::JackCoreMidiDriver;