--- cpp.orig/src/slice2php/Main.cpp 2011-06-15 21:43:58.000000000 +0200 +++ cpp/src/slice2php/Main.cpp 2012-09-10 11:43:58.000000000 +0200 @@ -1488,7 +1488,7 @@ printHeader(IceUtilInternal::Output& out) namespace { -IceUtil::Mutex* mutex = 0; +IceUtil::Mutex* mtx = 0; bool interrupted = false; class Init @@ -1497,13 +1497,13 @@ public: Init() { - mutex = new IceUtil::Mutex; + mtx = new IceUtil::Mutex; } ~Init() { - delete mutex; - mutex = 0; + delete mtx; + mtx = 0; } }; @@ -1514,7 +1514,7 @@ Init init; static void interruptedCallback(int signal) { - IceUtilInternal::MutexPtrLock sync(mutex); + IceUtilInternal::MutexPtrLock sync(mtx); interrupted = true; } @@ -1777,7 +1777,7 @@ compile(int argc, char* argv[]) } { - IceUtilInternal::MutexPtrLock sync(mutex); + IceUtilInternal::MutexPtrLock sync(mtx); if(interrupted) {