summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwilsond <wilsond@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-09-13 15:44:20 +0000
committerwilsond <wilsond@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-09-13 15:44:20 +0000
commit35f7fb2d9271733dd49be5ad38f152f0ca7a7e2f (patch)
treef87afcbcc48cbad8f605938902ccf3f0bb4799a0
parentb7d34762b887088703ddd1c9c7d51c62c298c4fa (diff)
downloadATCD-35f7fb2d9271733dd49be5ad38f152f0ca7a7e2f.tar.gz
ChangeLogTag: Thu Sep 13 15:34:15 UTC 2007 Dale Wilson <wilsond@ociweb.com>
-rw-r--r--ACE/ace/config-win32-common.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h
index f954f8166c0..b15856dff36 100644
--- a/ACE/ace/config-win32-common.h
+++ b/ACE/ace/config-win32-common.h
@@ -37,6 +37,10 @@
# endif /* !_FILE_OFFSET_BITS */
#endif /* _WIN64 || WIN64 */
+#if !defined (_WIN32_WINNT)
+# define _WIN32_WINNT 0x0400 // pretend it's at least WinNT 4.0
+#endif
+
// If the invoking procedure turned off debugging by setting NDEBUG, then
// also set ACE_NDEBUG, unless the user has already set it.
#if defined (NDEBUG)
@@ -608,17 +612,10 @@
# define WINVER 0x0400 // pretend it's at least WinNT 4.0
#endif
-#if !defined (_WIN32_WINNT)
-# define _WIN32_WINNT WINVER // be sure the newer version symbol is defined
- // Note this isn't really legit. Some OS's use
- // _WIN32_WINDOWS rather than _WIN32_WINNT
-#endif
-
-
///////////////////////////////////////
// windows version-specific definitions
// see: http://msdn2.microsoft.com/en-us/library/aa383745.aspx
-//
+//
// For TSS information
// see http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dllproc/base/thread_local_storage.asp
@@ -649,7 +646,7 @@
# define ACE_DEFAULT_THREAD_KEYS 80
# endif // ! defined(ACE_DEFAULT_THREAD_KEYS)
#else
-// antique windows
+// antique windows
# if ! defined(ACE_DEFAULT_THREAD_KEYS)
# define ACE_DEFAULT_THREAD_KEYS 64
# endif // ! defined(ACE_DEFAULT_THREAD_KEYS)