diff options
| author | Steve Huston <shuston@riverace.com> | 2007-01-06 00:13:33 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2007-01-06 00:13:33 +0000 |
| commit | a3b7dea69399648c2a7a0153044a4a0ab10109f4 (patch) | |
| tree | 0d4aa36885e171bacce4f30edfea290e5fbd8140 /ACE/ace/Asynch_IO.h | |
| parent | 2bb628ef1397bc2ff4c26817bb71c338214c35ed (diff) | |
| download | ATCD-a3b7dea69399648c2a7a0153044a4a0ab10109f4.tar.gz | |
ChangeLogTag:Sat Jan 6 00:06:52 UTC 2007 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ACE/ace/Asynch_IO.h')
| -rw-r--r-- | ACE/ace/Asynch_IO.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h index c4ae5c8ca3b..873ef6f40e9 100644 --- a/ACE/ace/Asynch_IO.h +++ b/ACE/ace/Asynch_IO.h @@ -33,7 +33,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) +#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) #include "ace/Synch_Traits.h" #if defined (ACE_HAS_THREADS) @@ -49,8 +49,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -# if defined (ACE_WIN32) && ! defined (ACE_HAS_WINCE) \ - && ! defined (ACE_HAS_PHARLAP) +# if defined (ACE_HAS_WIN32_OVERLAPPED_IO) typedef TRANSMIT_FILE_BUFFERS ACE_TRANSMIT_FILE_BUFFERS; typedef LPTRANSMIT_FILE_BUFFERS ACE_LPTRANSMIT_FILE_BUFFERS; typedef PTRANSMIT_FILE_BUFFERS ACE_PTRANSMIT_FILE_BUFFERS; @@ -59,7 +58,7 @@ typedef PTRANSMIT_FILE_BUFFERS ACE_PTRANSMIT_FILE_BUFFERS; # define ACE_STATUS_TIMEOUT STATUS_TIMEOUT # define ACE_WAIT_FAILED WAIT_FAILED # define ACE_WAIT_TIMEOUT WAIT_TIMEOUT -# else /* ACE_WIN32 */ +# else /* ACE_HAS_WIN32_OVERLAPPED_IO */ struct ACE_TRANSMIT_FILE_BUFFERS { void *Head; @@ -76,7 +75,7 @@ typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS; # define ACE_STATUS_TIMEOUT LONG_MAX # define ACE_WAIT_FAILED LONG_MAX # define ACE_WAIT_TIMEOUT LONG_MAX -# endif /* ACE_WIN32 */ +# endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ // Forward declarations class ACE_Proactor; @@ -338,7 +337,7 @@ public: int priority = 0, int signal_number = ACE_SIGRTMIN); -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) +#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) /** * Same as above but with scatter support, through chaining of composite * message blocks using the continuation field. @@ -348,7 +347,7 @@ public: const void *act = 0, int priority = 0, int signal_number = ACE_SIGRTMIN); -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */ +#endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) */ /// Return the underlying implementation class. // (this should be protected...) @@ -462,7 +461,7 @@ public: int priority = 0, int signal_number = ACE_SIGRTMIN); -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) +#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) /** * Same as above but with gather support, through chaining of composite * message blocks using the continuation field. @@ -472,7 +471,7 @@ public: const void *act = 0, int priority = 0, int signal_number = ACE_SIGRTMIN); -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */ +#endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) */ /// Return the underlying implementation class. /// @todo (this should be protected...) |