diff options
| author | Adam Mitz <mitza@objectcomputing.com> | 2020-04-17 15:26:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 15:26:24 -0500 |
| commit | c9a9c59cc45252ab0e65ac78d1b414d954c13556 (patch) | |
| tree | c40a81bb0e59c7e3afba8e615cba92c0776e1f49 | |
| parent | e8b8245004ddf3874ab2079c4feddf70fe7a5be8 (diff) | |
| parent | f0eeddf26c5a9571d9ebac269bbe5ca9b473740b (diff) | |
| download | ATCD-c9a9c59cc45252ab0e65ac78d1b414d954c13556.tar.gz | |
Merge pull request #1079 from mitza-oci/master
Windows API usage updates from #1069
| -rw-r--r-- | ACE/ace/config-win32-common.h | 9 | ||||
| -rw-r--r-- | ACE/examples/Reactor/WFMO_Reactor/APC.cpp | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index 996760bb4b9..30f06adb140 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -562,6 +562,9 @@ # define ACE_WSOCK_VERSION 1, 1 #endif /* ACE_HAS_WINSOCK2 */ +#if _WIN32_WINNT >= 0x400 +# define ACE_HAS_WIN32_TRYLOCK +#endif #if _WIN32_WINNT < 0x600 # define ACE_LACKS_IF_NAMETOINDEX #endif @@ -575,10 +578,12 @@ #if !defined (ACE_HAS_WINCE) # define ACE_HAS_INTERLOCKED_EXCHANGEADD #endif -#define ACE_HAS_WIN32_TRYLOCK #if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) -# define ACE_HAS_SIGNAL_OBJECT_AND_WAIT + +# if _WIN32_WINNT >= 0x400 +# define ACE_HAS_SIGNAL_OBJECT_AND_WAIT +# endif // If CancelIO is undefined get the updated sp2-sdk from MS # define ACE_HAS_CANCEL_IO diff --git a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp index 8fb78608531..bb2000fa963 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp @@ -13,7 +13,7 @@ #include "ace/OS_main.h" -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && _WIN32_WINNT >= 0x400 #include "ace/Reactor.h" #include "ace/Auto_Event.h" |