Index: ext/libicpf/src/mutex.cpp
===================================================================
diff -u -N -r30ed05249d32bbb24596169c77afa3c878299cb3 -r338a33bbdb8c82416f0351408eea3243520784e5
--- ext/libicpf/src/mutex.cpp	(.../mutex.cpp)	(revision 30ed05249d32bbb24596169c77afa3c878299cb3)
+++ ext/libicpf/src/mutex.cpp	(.../mutex.cpp)	(revision 338a33bbdb8c82416f0351408eea3243520784e5)
@@ -7,20 +7,25 @@
 
 BEGIN_ICPF_NAMESPACE
 
-#define m_pcsLock ((CRITICAL_SECTION*)m_pLock)
-#define m_pmLock ((pthread_mutex_t*)m_pLock)
+#ifdef _WIN32
+	#define m_pcsLock ((CRITICAL_SECTION*)m_pLock)
+#else
+	#define m_pmLock ((pthread_mutex_t*)m_pLock)
+#endif
 
 /** Standard constructor.
  */
-mutex::mutex()
+mutex::mutex() :
+	m_pLock(NULL)
 {
 	construct();
 }
 
 /** Compatibility layer constructor (with d_mutex). Can take a fake dumpctx pointer and a fake mutex name,
  *  although does nothing with it. Effectively it is almost the same as standard constructor.
  */
-mutex::mutex(const char_t* /*pszStr*/)
+mutex::mutex(const char_t* /*pszStr*/) :
+	m_pLock(NULL)
 {
 	construct();
 }