diff options
-rw-r--r-- | ACE/ace/OS_main.h | 2 | ||||
-rw-r--r-- | ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/OS_main.h b/ACE/ace/OS_main.h index 4dd48ffa794..5a15bac6a27 100644 --- a/ACE/ace/OS_main.h +++ b/ACE/ace/OS_main.h @@ -302,7 +302,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi } \ int ace_main_i -# endif /* ACE_PSOSIM */ +# endif # endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ # ifdef ACE_MQX diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h index 3567e4c897f..9576356d5fd 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h @@ -173,9 +173,9 @@ inline ACE_Test_Output::ACE_Test_Output (void) inline ACE_Test_Output::~ACE_Test_Output (void) { -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && !defined (ACE_PSOS) +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) ACE_LOG_MSG->msg_ostream (&cerr); -#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY && ! ACE_PSOS */ +#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM); ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR); |