3 files changed, 5 insertions, 3 deletions
diff --git a/cpp/src/qpid/sys/posix/Condition.h b/cpp/src/qpid/sys/posix/Condition.h
index 86d6500ee9..62e42c01e9 100644
--- a/cpp/src/qpid/sys/posix/Condition.h
+++ b/cpp/src/qpid/sys/posix/Condition.h
@@ -56,7 +56,7 @@ Condition::Condition() {
 }
 
 Condition::~Condition() {
-    QPID_POSIX_ASSERT_THROW_IF(pthread_cond_destroy(&condition));
+    QPID_POSIX_ABORT_IF(pthread_cond_destroy(&condition));
 }
 
 void Condition::wait(Mutex& mutex) {
diff --git a/cpp/src/qpid/sys/posix/Mutex.h b/cpp/src/qpid/sys/posix/Mutex.h
index cd5a8affd4..564cb72c56 100644
--- a/cpp/src/qpid/sys/posix/Mutex.h
+++ b/cpp/src/qpid/sys/posix/Mutex.h
@@ -109,7 +109,7 @@ Mutex::Mutex() {
 }
 
 Mutex::~Mutex(){
-    QPID_POSIX_ASSERT_THROW_IF(pthread_mutex_destroy(&mutex));
+    QPID_POSIX_ABORT_IF(pthread_mutex_destroy(&mutex));
 }
 
 void Mutex::lock() {
@@ -130,7 +130,7 @@ RWlock::RWlock() {
 }
 
 RWlock::~RWlock(){
-    QPID_POSIX_ASSERT_THROW_IF(pthread_rwlock_destroy(&rwlock));
+    QPID_POSIX_ABORT_IF(pthread_rwlock_destroy(&rwlock));
 }
 
 void RWlock::wlock() {
diff --git a/cpp/src/qpid/sys/posix/check.h b/cpp/src/qpid/sys/posix/check.h
index f3031b7593..5f18b26cec 100644
--- a/cpp/src/qpid/sys/posix/check.h
+++ b/cpp/src/qpid/sys/posix/check.h
@@ -46,4 +46,6 @@
     do { int e=(ERRNO); if (e) { errno=e; ::perror(0); assert(0); } } while(0)
 #endif
 
+#define QPID_POSIX_ABORT_IF(ERRNO) if ((int) ERRNO) { errno=ERRNO; ::perror(0); abort(); }
+
 #endif  /*!_posix_check_h*/