summaryrefslogtreecommitdiff
path: root/ace/Reactor.cpp
diff options
context:
space:
mode:
authornw1 <nw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-11-20 06:25:06 +0000
committernw1 <nw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-11-20 06:25:06 +0000
commit09e5d2ffc3b0bdb1cb3354a5c9ade669110fde87 (patch)
treeb817c0cda5cacde922bb688b135c7bdcb1ca8ff8 /ace/Reactor.cpp
parentc44e4c287c15c3603a97bd31e1e0acad8bd2ad4f (diff)
downloadATCD-09e5d2ffc3b0bdb1cb3354a5c9ade669110fde87.tar.gz
*** empty log message ***
Diffstat (limited to 'ace/Reactor.cpp')
-rw-r--r--ace/Reactor.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index dd30d8bafa0..79d877ec5ce 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -25,11 +25,13 @@ ACE_Reactor::ACE_Reactor (ACE_Reactor_Impl *impl)
if (this->implementation () == 0)
{
-#if defined (ACE_WIN32) && !defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL)
- ACE_NEW (impl, ACE_WFMO_Reactor);
-#else /* ACE_WIN32 && !ACE_USE_SELECT_REACTOR_AS_REACTOR */
+#if defined (ACE_WIN32)
+#if !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL)
ACE_NEW (impl, ACE_Select_Reactor);
-#endif /* ACE_WIN32 && !ACE_USE_SELECT_REACTOR_AS_REACTOR */
+#else /* We have winsock and ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL is not defined */
+ ACE_NEW (impl, ACE_WFMO_Reactor);
+#endif /* ! (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) || (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) */
+#endif /* ACE_WIN32 */
this->implementation (impl);
this->delete_implementation_ = 1;
}