From: Ken Brown <kbrown@cornell.edu>
Date: Fri, 26 Sep 2014 07:06:35 +0000 (+0300)
Subject: src/w32term.h (ALIGN_STACK): Fix the cpp condition.
X-Git-Tag: emacs-25.0.90~2635^2~679^2~216
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=241692602563684cb4a964ed2af8776057dd2a8d;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 87d33121495..526d2058b51 100644
--- 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 f9025fd13ad..065ef6a8d72 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 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