diff options
| author | wilsond <wilsond@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-09-13 15:39:21 +0000 |
|---|---|---|
| committer | wilsond <wilsond@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-09-13 15:39:21 +0000 |
| commit | 4a572d72ff92709b6e5d4e1c71a11d3c798451af (patch) | |
| tree | accdc0e6f2746be672403089b80d2c53f2fbf68a /ACE/ace | |
| parent | cde9d07d44b9f3c41afdae5bf2925a9aa14b71e2 (diff) | |
| download | ATCD-4a572d72ff92709b6e5d4e1c71a11d3c798451af.tar.gz | |
ChangeLogTag: Thu Sep 13 15:34:15 UTC 2007 Dale Wilson <wilsond@ociweb.com>
Diffstat (limited to 'ACE/ace')
| -rw-r--r-- | ACE/ace/OS_NS_Thread.h | 8 | ||||
| -rw-r--r-- | ACE/ace/config-win32-common.h | 55 |
2 files changed, 54 insertions, 9 deletions
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 */ |