1 files changed, 35 insertions, 11 deletions
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
index 34ad5f8dd4a..37e556d21a1 100644
--- a/cpp/src/slice2freeze/Main.cpp
+++ b/cpp/src/slice2freeze/Main.cpp
@@ -10,7 +10,8 @@
 #include <IceUtil/DisableWarnings.h>
 #include <IceUtil/Options.h>
 #include <IceUtil/CtrlCHandler.h>
-#include <IceUtil/StaticMutex.h>
+#include <IceUtil/Mutex.h>
+#include <IceUtil/MutexPtrLock.h>
 #include <Slice/Preprocessor.h>
 #include <Slice/CPlusPlusUtil.h>
 #include <Slice/FileTracker.h>
@@ -24,19 +25,42 @@ using namespace IceUtil;
 using namespace IceUtilInternal;
 using namespace Slice;
 
-static IceUtil::StaticMutex _mutex = ICE_STATIC_MUTEX_INITIALIZER;
-static bool _interrupted = false;
+namespace
+{
+
+IceUtil::Mutex* mutex = 0;
+bool interrupted = false;
+
+class Init
+{
+public:
+
+    Init()
+    {
+        mutex = new IceUtil::Mutex;
+    }
+
+    ~Init()
+    {
+        delete mutex;
+        mutex = 0;
+    }
+};
+
+Init init;
+
+string ICE_ENCODING_COMPARE = "Freeze::IceEncodingCompare";
+
+}
 
 void
 interruptedCallback(int signal)
 {
-    IceUtil::StaticMutex::Lock lock(_mutex);
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
 
-    _interrupted = true;
+    interrupted = true;
 }
 
-static string ICE_ENCODING_COMPARE = "Freeze::IceEncodingCompare";
-
 class MetaDataVisitor : public ParserVisitor
 {
 public:
@@ -1965,9 +1989,9 @@ compile(int argc, char* argv[])
         }
 
         {
-            IceUtil::StaticMutex::Lock lock(_mutex);
+            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
 
-            if(_interrupted)
+            if(interrupted)
             {
                 return EXIT_FAILURE;
             }
@@ -2012,9 +2036,9 @@ compile(int argc, char* argv[])
     u->destroy();
 
     {
-        IceUtil::StaticMutex::Lock lock(_mutex);
+        IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
 
-        if(_interrupted)
+        if(interrupted)
         {
             FileTracker::instance()->cleanup();
             return EXIT_FAILURE;