aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2014-10-18 09:40:04 +0300
committerEli Zaretskii2014-10-18 09:40:04 +0300
commit4b6d6e69098ec2c823b637a82e1c3fb10539f7b0 (patch)
tree3523e73193a814d79a49246d639e8d9101b6f03c /src
parent6c854f07d1a6cbe46bd5a5a9dd3910c87b418d93 (diff)
downloademacs-4b6d6e69098ec2c823b637a82e1c3fb10539f7b0.tar.gz
emacs-4b6d6e69098ec2c823b637a82e1c3fb10539f7b0.zip
Ensure 8-byte stack alignment in w32select's callback.
src/w32select.c (owner_callback): Mark with ALIGN_STACK attribute.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32select.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a5c68d77bb1..026ae46299d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-10-18 Eli Zaretskii <eliz@gnu.org>
2
3 * w32select.c (owner_callback): Mark with ALIGN_STACK attribute.
4
12014-10-17 Eli Zaretskii <eliz@gnu.org> 52014-10-17 Eli Zaretskii <eliz@gnu.org>
2 6
3 * xterm.c (x_draw_hollow_cursor): Fix display of hollow cursor on 7 * xterm.c (x_draw_hollow_cursor): Fix display of hollow cursor on
diff --git a/src/w32select.c b/src/w32select.c
index 7c21dde01a5..9fa84ca5c54 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -95,8 +95,8 @@ static Lisp_Object render_locale (void);
95static Lisp_Object render_all (Lisp_Object ignore); 95static Lisp_Object render_all (Lisp_Object ignore);
96static void run_protected (Lisp_Object (*code) (Lisp_Object), Lisp_Object arg); 96static void run_protected (Lisp_Object (*code) (Lisp_Object), Lisp_Object arg);
97static Lisp_Object lisp_error_handler (Lisp_Object error); 97static Lisp_Object lisp_error_handler (Lisp_Object error);
98static LRESULT CALLBACK owner_callback (HWND win, UINT msg, 98static LRESULT CALLBACK ALIGN_STACK owner_callback (HWND win, UINT msg,
99 WPARAM wp, LPARAM lp); 99 WPARAM wp, LPARAM lp);
100static HWND create_owner (void); 100static HWND create_owner (void);
101 101
102static void setup_config (void); 102static void setup_config (void);
@@ -420,7 +420,7 @@ lisp_error_handler (Lisp_Object error)
420} 420}
421 421
422 422
423static LRESULT CALLBACK 423static LRESULT CALLBACK ALIGN_STACK
424owner_callback (HWND win, UINT msg, WPARAM wp, LPARAM lp) 424owner_callback (HWND win, UINT msg, WPARAM wp, LPARAM lp)
425{ 425{
426 switch (msg) 426 switch (msg)