Index: ext/libicpf/src/mutex.h
===================================================================
diff -u -rd4269744a04d36c8a8146a84bc27118031fa42ac -r2e89265740d37576aaef5a9cdd965349eda4e3d3
--- ext/libicpf/src/mutex.h	(.../mutex.h)	(revision d4269744a04d36c8a8146a84bc27118031fa42ac)
+++ ext/libicpf/src/mutex.h	(.../mutex.h)	(revision 2e89265740d37576aaef5a9cdd965349eda4e3d3)
@@ -29,7 +29,7 @@
 
 BEGIN_ICPF_NAMESPACE
 
-#ifdef _DEBUG_MUTEX
+#if defined(ENABLE_MUTEX_DEBUGGING) && defined(DEBUG_MUTEX)
 	#define MLOCK(mutex) (mutex).lock(__FILE__, __LINE__, __FUNCTION__)
 	#define MUNLOCK(mutex) (mutex).unlock(__FILE__, __LINE__, __FUNCTION__)
 #else