procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #18699 with startup aborts of 32-bit MinGW64 build.

Browse source 
src/w32term.h (ALIGN_STACK): Use _WIN64, not _W64, to distinguish
 between 32-bit and 64-bit MinGW builds.
This commit is contained in:
Eli Zaretskii 2014-10-13 15:44:03 +03:00
parent 07bcae0d0b
commit 2b882ee755
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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).

2
src/w32term.h
View file

@ -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