2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index add43dc4b07..3200a315daa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32term.h (ALIGN_STACK): Use _WIN64, not _W64, to distinguish
+        between 32-bit and 64-bit MinGW builds.  (Bug#18699)
+
 2014-10-12  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix port to Debian GNU/kFreeBSD 7 (wheezy) (Bug#18666).
diff --git a/src/w32term.h b/src/w32term.h
index 065ef6a8d72..fb37550100e 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -30,7 +30,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    re-align the stack at function entry.  Further details about this
    can be found in http://www.peterstock.co.uk/games/mingw_sse/.  */
 #ifdef __GNUC__
-# if USE_STACK_LISP_OBJECTS && !defined _W64 && !defined __x86_64__     \
+# if USE_STACK_LISP_OBJECTS && !defined _WIN64 && !defined __x86_64__   \
   && __GNUC__ + (__GNUC_MINOR__ > 1) >= 5
 #  define ALIGN_STACK __attribute__((force_align_arg_pointer))
 # else