From f0957dcb7d598248a1b1d3177ba1d15ddebde341 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Tue, 29 Aug 2006 21:34:37 +0000 Subject: [PATCH] ICU-5352 Use better macros for determining CPU type. X-SVN-Rev: 20183 --- icu4c/source/common/unicode/pwin32.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/icu4c/source/common/unicode/pwin32.h b/icu4c/source/common/unicode/pwin32.h index 669f55a6ec8..198ce8e3322 100644 --- a/icu4c/source/common/unicode/pwin32.h +++ b/icu4c/source/common/unicode/pwin32.h @@ -173,7 +173,11 @@ typedef unsigned int uint32_t; #define ICU_USE_THREADS 1 /* On strong memory model CPUs (e.g. x86 CPUs), we use a safe & quick double check mutex lock. */ -#if defined(_M_IX86) || defined(_M_AMD64) || (defined(__GNUC__) && (defined(__i386__) || defined(__amd64__))) +/* +Microsoft can define _M_IX86, _M_AMD64 (before Visual Studio 8) or _M_X64 (starting in Visual Studio 8). +Intel can define _M_IX86 or _M_X64 +*/ +#if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))) #define UMTX_STRONG_MEMORY_MODEL 1 #endif