From 0056b6812c6cb3a740ef77ad47eaedc395dc6fac Mon Sep 17 00:00:00 2001 From: ivmai Date: Thu, 17 Dec 2009 07:16:42 +0000 Subject: [PATCH] 2009-12-07 Ivan Maidanski (really Emmanuel Stapf) * src/atomic_ops.h: Recognize _M_X64 (as an alias for _AMD64_). --- ChangeLog | 4 ++++ src/atomic_ops.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e3181a4..6f577ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-12-07 Ivan Maidanski (really Emmanuel Stapf) + + * src/atomic_ops.h: Recognize _M_X64 (as an alias for _AMD64_). + 2009-12-04 Ivan Maidanski * configure.ac, README: Change to version 7.2alpha5. diff --git a/src/atomic_ops.h b/src/atomic_ops.h index 1424711..30d045e 100644 --- a/src/atomic_ops.h +++ b/src/atomic_ops.h @@ -160,7 +160,7 @@ # define AO_compiler_barrier() __asm__ __volatile__("" : : : "memory") #elif defined(_MSC_VER) || defined(__DMC__) || defined(__BORLANDC__) \ || defined(__WATCOMC__) -# if defined(_AMD64_) || _MSC_VER >= 1400 +# if defined(_AMD64_) || defined(_M_X64) || _MSC_VER >= 1400 # if defined(_WIN32_WCE) /* # include */ # elif defined(_MSC_VER) @@ -282,7 +282,7 @@ #if defined(_MSC_VER) || defined(__DMC__) || defined(__BORLANDC__) \ || (defined(__WATCOMC__) && defined(__NT__)) -# if defined(_AMD64_) +# if defined(_AMD64_) || defined(_M_X64) # include "atomic_ops/sysdeps/msftc/x86_64.h" # elif defined(_M_IX86) || defined(x86) # include "atomic_ops/sysdeps/msftc/x86.h" -- 2.7.4