1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp
index 85d2186e386..656555aa74f 100644
--- a/cpp/src/IceUtil/CtrlCHandler.cpp
+++ b/cpp/src/IceUtil/CtrlCHandler.cpp
@@ -25,7 +25,8 @@ using namespace IceUtil;
 namespace
 {
 
-CtrlCHandlerCallback _callback = 0;
+CtrlCHandlerCallback _callback = ICE_NULLPTR;
+
 const CtrlCHandler* _handler = 0;
 
 IceUtil::Mutex* globalMutex = 0;
@@ -173,7 +174,7 @@ sigwaitThread(void*)
             callback = _callback;
         }
 
-        if(callback != 0)
+        if(callback)
         {
             callback(signal);
         }
@@ -235,8 +236,7 @@ CtrlCHandler::CtrlCHandler(CtrlCHandlerCallback callback)
 CtrlCHandler::~CtrlCHandler()
 {
     //
-    // Clear the handler, the sigwaitThread will exit if _handler is
-    // nil.
+    // Clear the handler, the sigwaitThread will exit if _handler is null
     //
     {
         IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);