diff options
| author | nw1 <nw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-11-20 06:25:06 +0000 |
|---|---|---|
| committer | nw1 <nw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-11-20 06:25:06 +0000 |
| commit | 09e5d2ffc3b0bdb1cb3354a5c9ade669110fde87 (patch) | |
| tree | b817c0cda5cacde922bb688b135c7bdcb1ca8ff8 | |
| parent | c44e4c287c15c3603a97bd31e1e0acad8bd2ad4f (diff) | |
| download | ATCD-09e5d2ffc3b0bdb1cb3354a5c9ade669110fde87.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-97b | 5 | ||||
| -rw-r--r-- | ace/Reactor.cpp | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b index 4fc6a717003..1e5e0724bf6 100644 --- a/ChangeLog-97b +++ b/ChangeLog-97b @@ -1,3 +1,8 @@ +Wed Nov 19 23:24:03 1997 <nw1@CHA-CHA> + + * ace/Reactor.h: Rearragned macros so we use Select_Reactor as + default if we don't have Winsock2. Irfan did it, not me. + Wed Nov 19 22:11:20 1997 Douglas C. Schmidt <schmidt@cs.wustl.edu> * ACE version 4.3.53, released Wed Nov 19 22:11:20 1997. 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; } |