src/w32term.h (ALIGN_STACK): Fix the cpp condition.

diff --git a/src/ChangeLog b/src/ChangeLog
index 87d33121495e45bd196c143333534f181a94b1f0..526d2058b51a5f7e1bf91467142080c51116266e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-09-26  Ken Brown  <kbrown@cornell.edu>
+
+       * w32term.h (ALIGN_STACK): Fix the cpp condition.
+
 2014-09-25  Eli Zaretskii  <eliz@gnu.org>
 
        * lisp.h (USE_STACK_LISP_OBJECTS): Default to false for 32-bit

diff --git a/src/w32term.h b/src/w32term.h
index f9025fd13ad854d4b863d4b86a0064b1f58b4643..065ef6a8d72e38643599aee83696dd5e0309e9fb 100644 (file)
--- 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 defined USE_STACK_LISP_OBJECTS && !defined _W64   \
+# if USE_STACK_LISP_OBJECTS && !defined _W64 && !defined __x86_64__    \
   && __GNUC__ + (__GNUC_MINOR__ > 1) >= 5
 #  define ALIGN_STACK __attribute__((force_align_arg_pointer))
 # else