2009-12-07 Ivan Maidanski <ivmai@mail.ru> (really Emmanuel Stapf)

	* src/atomic_ops.h: Recognize _M_X64 (as an alias for _AMD64_).

diff --git a/ChangeLog b/ChangeLog
index e3181a47a8e377e02a0256bdfdf5d25f73094035..6f577ed324d95f32a6ec932113fb867f2b3d0755 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-07  Ivan Maidanski <ivmai@mail.ru> (really Emmanuel Stapf)
+
+       * src/atomic_ops.h: Recognize _M_X64 (as an alias for _AMD64_).
+
 2009-12-04  Ivan Maidanski <ivmai@mail.ru>
 
        * configure.ac, README: Change to version 7.2alpha5.

diff --git a/src/atomic_ops.h b/src/atomic_ops.h
index 14247117253ce730543c22bc5f2b4838b72b80a9..30d045e8ea4d4b5b1995ee7189e713f46e009f10 100644 (file)
--- 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 <cmnintrin.h> */
 #   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"