[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118105: Fix bug #18699 with startup aborts of 32-bi
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r118105: Fix bug #18699 with startup aborts of 32-bit MinGW64 build. |
Date: |
Mon, 13 Oct 2014 12:44:51 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118105
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18699
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2014-10-13 15:44:03 +0300
message:
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.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/w32term.h w32term.h-20091113204419-o5vbwnq5f7feedwu-954
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-10-12 22:56:45 +0000
+++ b/src/ChangeLog 2014-10-13 12:44:03 +0000
@@ -1,3 +1,8 @@
+2014-10-13 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
Fix port to Debian GNU/kFreeBSD 7 (wheezy) (Bug#18666).
=== modified file 'src/w32term.h'
--- a/src/w32term.h 2014-09-26 07:06:35 +0000
+++ b/src/w32term.h 2014-10-13 12:44:03 +0000
@@ -30,7 +30,7 @@
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118105: Fix bug #18699 with startup aborts of 32-bit MinGW64 build.,
Eli Zaretskii <=