summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin R. Wilson <wilsonj@objectcomputing.com>2020-04-13 12:03:14 -0500
committerJustin R. Wilson <wilsonj@objectcomputing.com>2020-04-13 12:03:14 -0500
commit336b5d7ddb8a0d306e62e80b31f7838a4e359b36 (patch)
treed7701474c127604e9ca2c89328aec29f9b373c3e
parentae87fba1b2b23893e3273bd4f70e3ae93b9d105b (diff)
downloadATCD-336b5d7ddb8a0d306e62e80b31f7838a4e359b36.tar.gz
Check but don't define _WIN32_WINNT
-rw-r--r--ACE/NEWS2
-rw-r--r--ACE/ace/config-win32-common.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/ACE/NEWS b/ACE/NEWS
index e1b91f8a316..05156780e9b 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -1,7 +1,7 @@
USER VISIBLE CHANGES BETWEEN ACE-6.5.8 and ACE-6.5.9
====================================================
-. _WIN32_WINNT updated to 0x0600 from 0x0501.
+. _WIN32_WINNT no longer defined but checked for at least 0x0600.
USER VISIBLE CHANGES BETWEEN ACE-6.5.7 and ACE-6.5.8
====================================================
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h
index ea482fb234c..4dd4fa0413a 100644
--- a/ACE/ace/config-win32-common.h
+++ b/ACE/ace/config-win32-common.h
@@ -55,8 +55,8 @@
# endif /* !_FILE_OFFSET_BITS */
#endif /* _WIN64 || WIN64 */
-#if !defined (_WIN32_WINNT)
-# define _WIN32_WINNT 0x0600 // pretend it's at least Windows Vista
+#if !defined (_WIN32_WINNT) || _WIN32_WINNT < 0x0600
+# error _WIN32_WINNT must be at least 0x0600
#endif
// If the invoking procedure turned off debugging by setting NDEBUG, then