summaryrefslogtreecommitdiff
path: root/cpp/src/IceUtil/CtrlCHandler.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-12-03 10:02:49 +0100
committerBenoit Foucher <benoit@zeroc.com>2012-12-03 10:02:49 +0100
commit7464e320b77f207b722b402f6710a1eda6fb12f1 (patch)
tree319e7ca10d7cf959585cdb8dda065421cc13578b /cpp/src/IceUtil/CtrlCHandler.cpp
parentFixed ICE-5078 - sent callback called from wrong thread (diff)
downloadice-7464e320b77f207b722b402f6710a1eda6fb12f1.tar.bz2
ice-7464e320b77f207b722b402f6710a1eda6fb12f1.tar.xz
ice-7464e320b77f207b722b402f6710a1eda6fb12f1.zip
Fixed ICE-4998 - Remove Mac OS references from documentation files
Diffstat (limited to 'cpp/src/IceUtil/CtrlCHandler.cpp')
-rw-r--r--cpp/src/IceUtil/CtrlCHandler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp
index bb6bbb9f2a3..a6f2c6e9329 100644
--- a/cpp/src/IceUtil/CtrlCHandler.cpp
+++ b/cpp/src/IceUtil/CtrlCHandler.cpp
@@ -158,7 +158,7 @@ sigwaitThread(void*)
int rc = sigwait(&ctrlCLikeSignals, &signal);
#if defined(__APPLE__)
//
- // WORKAROUND: sigwait is not a cancelation point on MacOS X. To cancel this thread, the
+ // WORKAROUND: sigwait is not a cancelation point on OS X. To cancel this thread, the
// destructor cancels the thread and send a signal to the thread to unblock sigwait, then
// we explicitly test for cancellation.
//
@@ -239,7 +239,7 @@ CtrlCHandler::~CtrlCHandler()
assert(rc == 0);
#if defined(__APPLE__)
//
- // WORKAROUND: sigwait isn't a cancellation point on MacOS X, see
+ // WORKAROUND: sigwait isn't a cancellation point on OS X, see
// comment in sigwaitThread
//
pthread_kill(_tid, SIGTERM);