diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-07-26 18:46:21 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-07-26 18:46:21 +0000 |
| commit | 5615e0d0275c5997a9bd1d84428c2953d2104f79 (patch) | |
| tree | c0b39d4473db1aaf1cd357b18174bc08d5cc5a2a /ace/Asynch_IO.cpp | |
| parent | d7dcf652235387b069e6cf766e52d5171ec33822 (diff) | |
| download | ATCD-5615e0d0275c5997a9bd1d84428c2953d2104f79.tar.gz | |
*** empty log message ***
Diffstat (limited to 'ace/Asynch_IO.cpp')
| -rw-r--r-- | ace/Asynch_IO.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ace/Asynch_IO.cpp b/ace/Asynch_IO.cpp index 3ecbc992bd4..94d9d939458 100644 --- a/ace/Asynch_IO.cpp +++ b/ace/Asynch_IO.cpp @@ -10,6 +10,7 @@ #include "ace/Proactor.h" #include "ace/Message_Block.h" #include "ace/Service_Config.h" +#include "ace/Inet_Addr.h" #if !defined (__ACE_INLINE__) #include "ace/Asynch_IO.i" @@ -118,7 +119,7 @@ ACE_Asynch_Operation::open (ACE_Handler &handler, // <handler->proactor> is zero this->proactor_ = this->handler_->proactor (); if (this->proactor_ == 0) - this->proactor_ = ACE_Service_Config::proactor (); + this->proactor_ = ACE_Proactor::instance(); } // Register with the <proactor> @@ -505,7 +506,7 @@ ACE_Asynch_Accept::accept (ACE_Message_Block &message_block, ACE_HANDLE accept_handle, const void *act) { -#if defined (ACE_HAS_WINSOCK2) || (_WIN32_WINNT >= 0x0400) +#if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || (_WIN32_WINNT >= 0x0400) // Sanity check: make sure that enough space has been allocated by the caller. size_t address_size = sizeof (sockaddr_in) + sizeof (sockaddr); size_t space_in_use = message_block.wr_ptr () - message_block.base (); @@ -658,7 +659,7 @@ ACE_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, u_long flags, const void *act) { -#if defined (ACE_HAS_WINSOCK2) || (_WIN32_WINNT >= 0x0400) +#if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || (_WIN32_WINNT >= 0x0400) Result *result = 0; ACE_NEW_RETURN (result, Result (*this->handler_, |