From 7cae5ebd7b989029d1e3d1c511d6aef8dd7b749c Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 21 Jun 2012 17:58:07 -0500
Subject: [PATCH] Fixes for build issues found on Darwin.

---
 src/ca/client/perl/Makefile        |  2 +-
 src/libCom/osi/os/posix/osdMutex.c | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/ca/client/perl/Makefile b/src/ca/client/perl/Makefile
index dc58f771c..b3fe549c7 100644
--- a/src/ca/client/perl/Makefile
+++ b/src/ca/client/perl/Makefile
@@ -13,7 +13,7 @@ include $(TOP)/configure/CONFIG
 # to generate header file dependancies for Darwin.
 # Darwin has multiple -arch compiler flags.
 ifeq ($(OS_CLASS),Darwin)
-HDEPENDS_METHOD = CMD
+HDEPENDS_METHOD = MKMF
 endif
 
 ifneq ($(findstring darwin,$(T_A)),)
diff --git a/src/libCom/osi/os/posix/osdMutex.c b/src/libCom/osi/os/posix/osdMutex.c
index 44a3c4d6e..68235ab3f 100644
--- a/src/libCom/osi/os/posix/osdMutex.c
+++ b/src/libCom/osi/os/posix/osdMutex.c
@@ -28,8 +28,16 @@
 #include "epicsAssert.h"
 
 #define checkStatus(status,message) \
-if((status)) { \
-    errlogPrintf("epicsMutex %s failed: error %s\n",(message),strerror((status)));}
+    if((status)) { \
+        errlogPrintf("epicsMutex %s failed: error %s\n", \
+            (message), strerror((status))); \
+    }
+#define checkStatusQuit(status,message,method) \
+    if(status) { \
+        errlogPrintf("epicsMutex %s failed: error %s\n", \
+            (message), strerror((status))); \
+        cantProceed((method)); \
+    }
 
 static int mutexLock(pthread_mutex_t *id)
 {