From 2b882ee7556d07f874e3fcf51939604d6dd20197 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 13 Oct 2014 15:44:03 +0300 Subject: [PATCH] Fix bug #18699 with startup aborts of 32-bit MinGW64 build. src/w32term.h (ALIGN_STACK): Use _WIN64, not _W64, to distinguish between 32-bit and 64-bit MinGW builds. --- src/ChangeLog | 5 +++++ src/w32term.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * 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 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 . */ 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 -- 2.39.5