diff options
Diffstat (limited to 'ACE/ace/Proactor.cpp')
| -rw-r--r-- | ACE/ace/Proactor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp index 3d4206e0010..f3230148e5c 100644 --- a/ACE/ace/Proactor.cpp +++ b/ACE/ace/Proactor.cpp @@ -9,9 +9,9 @@ #include "ace/Object_Manager.h" #include "ace/Task_T.h" -#if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_SVCCONF) +#if !defined (ACE_LACKS_ACE_SVCCONF) # include "ace/Service_Config.h" -#endif /* !ACE_HAS_WINCE && !ACE_LACKS_ACE_SVCCONF */ +#endif /* !ACE_LACKS_ACE_SVCCONF */ #include "ace/Task_T.h" #include "ace/Log_Category.h" @@ -336,7 +336,7 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation, # endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ # endif /* !ACE_HAS_BROKEN_SIGEVENT_STRUCT */ # endif /* ACE_POSIX_AIOCB_PROACTOR */ -#elif (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#elif defined (ACE_WIN32) // WIN_Proactor. ACE_NEW (implementation, ACE_WIN32_Proactor); @@ -437,13 +437,13 @@ ACE_Proactor::name () int ACE_Proactor::check_reconfiguration (ACE_Proactor *) { -#if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_SVCCONF) +#if !defined (ACE_LACKS_ACE_SVCCONF) if (ACE_Service_Config::reconfig_occurred ()) { ACE_Service_Config::reconfigure (); return 1; } -#endif /* ! ACE_HAS_WINCE || ! ACE_LACKS_ACE_SVCCONF */ +#endif /* !ACE_LACKS_ACE_SVCCONF */ return 0; } |