ChangeLogTag: Thu Sep 13 15:34:15 UTC 2007 Dale Wilson <wilsond@ociweb.com>

3 files changed, 65 insertions, 9 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 7442fdb69b4..c537c4924cb 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,14 @@
+Thu Sep 13 15:34:15 UTC 2007  Dale Wilson  <wilsond@ociweb.com>
+
+        * ace/OS_NS_Thread.h:
+        * ace/config-win32-common.h:
+          Base the definiton of ACE_DEFAULT_THREAD_KEYS on the
+          Windows version rather than using the misleading
+          TLS_MINIMUM_AVAILABLE
+          Move the check to see if _WIN32_WINNT is defined
+          until *after* windows.h is included (directly or indirectly)
+
+
 Thu Sep 13 15:17:28 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
 
         * ace/ATM_Stream.cpp:
diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h
index 42fb9bf95e6..560c5405ff5 100644
--- a/ACE/ace/OS_NS_Thread.h
+++ b/ACE/ace/OS_NS_Thread.h
@@ -875,11 +875,9 @@ private:
 };
 
 # else   /* ! ACE_HAS_TSS_EMULATION */
-    // allow user to define its own ACE_DEFAULT_THREAD_KEYS in Windows,
-    // where The MSSDK defines only 64 entries
-#   if defined (TLS_MINIMUM_AVAILABLE) && !defined (ACE_DEFAULT_THREAD_KEYS)
-    // WIN32 platforms define TLS_MINIMUM_AVAILABLE natively.
-#     define ACE_DEFAULT_THREAD_KEYS TLS_MINIMUM_AVAILABLE
+#   if !defined (ACE_DEFAULT_THREAD_KEYS)
+      // This should have been defined in config-win32-common.h
+#     define ACE_DEFAULT_THREAD_KEYS 1088
 #   endif /* TSL_MINIMUM_AVAILABLE */
 
 # endif /* ACE_HAS_TSS_EMULATION */
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h
index 71678238885..f954f8166c0 100644
--- a/ACE/ace/config-win32-common.h
+++ b/ACE/ace/config-win32-common.h
@@ -37,10 +37,6 @@
 #  endif  /* !_FILE_OFFSET_BITS */
 #endif /* _WIN64 || WIN64 */
 
-#if !defined (_WIN32_WINNT)
-# define _WIN32_WINNT 0x0400
-#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,6 +604,57 @@
 #  endif
 # endif /* !ACE_HAS_WINCE */
 
+#if !defined (WINVER)
+# 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
+
+#if (WINVER>=0x0600)
+// Windows Server 2008 definitions go here
+// Windows Vista defintions go here
+#  if ! defined(ACE_DEFAULT_THREAD_KEYS)
+#    define ACE_DEFAULT_THREAD_KEYS 1088
+#  endif // ! defined(ACE_DEFAULT_THREAD_KEYS)
+#elif (WINVER>=0x0502)
+  // Windows Server 2003 SP1 definitions go here
+#  if ! defined(ACE_DEFAULT_THREAD_KEYS)
+#    define ACE_DEFAULT_THREAD_KEYS 1088
+#  endif // ! defined(ACE_DEFAULT_THREAD_KEYS)
+#elif (WINVER>=0x0501)
+// Windows XP definitions go here
+#  if ! defined(ACE_DEFAULT_THREAD_KEYS)
+#    define ACE_DEFAULT_THREAD_KEYS 1088
+#  endif // ! defined(ACE_DEFAULT_THREAD_KEYS)
+#elif (WINVER>=0x0500)
+// Windows 2000 definitions go here
+#  if ! defined(ACE_DEFAULT_THREAD_KEYS)
+#    define ACE_DEFAULT_THREAD_KEYS 1088
+#  endif // ! defined(ACE_DEFAULT_THREAD_KEYS)
+#elif (WINVER>=0x0410)
+// Windows 98 definitions go here
+#  if ! defined(ACE_DEFAULT_THREAD_KEYS)
+#    define ACE_DEFAULT_THREAD_KEYS 80
+#  endif // ! defined(ACE_DEFAULT_THREAD_KEYS)
+#else
+// antique windows
+#  if ! defined(ACE_DEFAULT_THREAD_KEYS)
+#    define ACE_DEFAULT_THREAD_KEYS 64
+#  endif // ! defined(ACE_DEFAULT_THREAD_KEYS)
+#endif
+
 #if !defined (ACE_DEFAULT_BACKLOG)
 #  define ACE_DEFAULT_BACKLOG SOMAXCONN
 #endif /* ACE_DEFAULT_BACKLOG */