summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2000-05-25 22:38:06 +0000
committerSteve Huston <shuston@riverace.com>2000-05-25 22:38:06 +0000
commit334b6c494857fc608bee6dda6bb5719778b6abba (patch)
treee85c2ceb66f560933508c6553ce3b065b9cfd950
parent8889f6bc9d3e2ab2318af49b1ee5fa212c467e21 (diff)
downloadATCD-334b6c494857fc608bee6dda6bb5719778b6abba.tar.gz
ChangeLogTag:Thu May 25 17:39:22 2000 Steve Huston <shuston@riverace.com>
-rw-r--r--ace/Event_Handler.cpp4
-rw-r--r--ace/Log_Msg.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/ace/Event_Handler.cpp b/ace/Event_Handler.cpp
index 6e9d728c002..2d705fbc73b 100644
--- a/ace/Event_Handler.cpp
+++ b/ace/Event_Handler.cpp
@@ -188,7 +188,7 @@ ACE_Event_Handler::register_stdin_handler (ACE_Event_Handler *eh,
ACE_Thread_Manager *thr_mgr,
int flags)
{
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) || defined (ACE_PSOS)
ACE_UNUSED_ARG (reactor);
eh->reactor (reactor);
@@ -200,7 +200,7 @@ ACE_Event_Handler::register_stdin_handler (ACE_Event_Handler *eh,
return reactor->register_handler (ACE_STDIN,
eh,
ACE_Event_Handler::READ_MASK);
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 || ACE_PSOS */
}
int
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 8c9f1f1fe59..d156fdcf8a2 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -1311,10 +1311,10 @@ ACE_Log_Msg::log (ACE_Log_Record &log_record,
int tracing = this->tracing_enabled ();
this->stop_tracing ();
-#if !defined (ACE_WIN32)
+#if !defined (ACE_WIN32) && !defined (ACE_PSOS)
// Make this block signal-safe.
ACE_Log_Msg_Sig_Guard sb;
-#endif /* ACE_WIN32 */
+#endif /* !ACE_WIN32 && !ACE_PSOS */
// Make sure that the lock is held during all this.
ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,