From 75095e78e03d16d08f29770c9c80ec8f34792bc0 Mon Sep 17 00:00:00 2001 From: Andrew Morrow Date: Mon, 3 Jun 2013 15:49:16 -0400 Subject: SERVER-9410 Permit use of Interlocked operations on Windows Server 2003 --- src/mongo/platform/atomic_intrinsics_win32.h | 2 +- src/mongo/platform/windows_basic.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mongo') diff --git a/src/mongo/platform/atomic_intrinsics_win32.h b/src/mongo/platform/atomic_intrinsics_win32.h index b48805e331a..176a6a53449 100644 --- a/src/mongo/platform/atomic_intrinsics_win32.h +++ b/src/mongo/platform/atomic_intrinsics_win32.h @@ -88,7 +88,7 @@ namespace mongo { class AtomicIntrinsics::type> { public: -#if defined(NTDDI_VERSION) && defined(NTDDI_VISTA) && (NTDDI_VERSION >= NTDDI_VISTA) +#if defined(NTDDI_VERSION) && defined(NTDDI_WS03SP2) && (NTDDI_VERSION >= NTDDI_WS03SP2) static const bool kHaveInterlocked64 = true; #else static const bool kHaveInterlocked64 = false; diff --git a/src/mongo/platform/windows_basic.h b/src/mongo/platform/windows_basic.h index 371e3416da8..b516900cd79 100644 --- a/src/mongo/platform/windows_basic.h +++ b/src/mongo/platform/windows_basic.h @@ -28,8 +28,8 @@ #if !defined(_WIN32_WINNT) // Can't use symbolic versions here, since we may not have seen sdkddkver.h yet. #if defined(_WIN64) -// 64-bit builds default to Windows Vista support. -#define _WIN32_WINNT 0x0600 +// 64-bit builds default to Windows Server 2003 support. +#define _WIN32_WINNT 0x0502 #else // 32-bit builds default to Windows XP support. #define _WIN32_WINNT 0x0501 @@ -62,8 +62,8 @@ #endif #if defined(_WIN64) -#if !defined(NTDDI_VISTA) || (NTDDI_VERSION < NTDDI_VISTA) -#error "64 bit mongo does not support Windows versions older than Vista" +#if !defined(NTDDI_WS03SP2) || (NTDDI_VERSION < NTDDI_WS03SP2) +#error "64 bit mongo does not support Windows versions older than Windows Server 2003 SP 2" #endif #else #if !defined(NTDDI_WINXPSP3) || (NTDDI_VERSION < NTDDI_WINXPSP3) -- cgit v1.2.1