Index: ext/libicpf/src/libicpf.h
===================================================================
diff -u -re17c80d36eaa0430313e7d1058aa7a301d1510af -r338a33bbdb8c82416f0351408eea3243520784e5
--- ext/libicpf/src/libicpf.h	(.../libicpf.h)	(revision e17c80d36eaa0430313e7d1058aa7a301d1510af)
+++ ext/libicpf/src/libicpf.h	(.../libicpf.h)	(revision 338a33bbdb8c82416f0351408eea3243520784e5)
@@ -13,6 +13,17 @@
  */
 #define ALLOW_UNICODE
 
+/** \brief Enables the mutex debugging code throughout this library.
+ *
+ *  Enables compiling the d_mutex class, so external or internal code could use mutex
+ *  debugging.
+ */
+//#define ENABLE_MUTEX_DEBUGGING
+
+/** \brief Enables mutex debugging/tracking in the internal and external code.
+ */
+//#define DEBUG_MUTEX
+
 /** \brief Enables use of encryption throughout this library.
  *
  * Enabling this macro enables usage of the encryption in some modules.
@@ -29,6 +40,7 @@
                 *  (also for importing (when LIBICPF_EXPORTS macro is undefined) in other apps).
                 */
                 #define LIBICPF_API __declspec(dllexport)
+				#define ICPFTEMPL_EXTERN
         #else
                 /** \brief Import/export macros
                 *
@@ -37,6 +49,7 @@
                 *  (also for importing (when LIBICPF_EXPORTS macro is undefined) in other apps).
                 */
                 #define LIBICPF_API __declspec(dllimport)
+				#define ICPFTEMPL_EXTERN extern
         #endif
 #else
         /** \brief Import/export macros
@@ -51,6 +64,6 @@
 /// Begins ch namespace
 #define BEGIN_ICPF_NAMESPACE namespace icpf {
 /// Ends ch namespace
-#define END_ICPF_NAMESPACE };
+#define END_ICPF_NAMESPACE }
 
 #endif