From 4b6d6e69098ec2c823b637a82e1c3fb10539f7b0 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 18 Oct 2014 09:40:04 +0300 Subject: [PATCH] Ensure 8-byte stack alignment in w32select's callback. src/w32select.c (owner_callback): Mark with ALIGN_STACK attribute. --- src/ChangeLog | 4 ++++ src/w32select.c | 6 +++--- 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 @@ +2014-10-18 Eli Zaretskii + + * w32select.c (owner_callback): Mark with ALIGN_STACK attribute. + 2014-10-17 Eli Zaretskii * 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); static Lisp_Object render_all (Lisp_Object ignore); static void run_protected (Lisp_Object (*code) (Lisp_Object), Lisp_Object arg); static Lisp_Object lisp_error_handler (Lisp_Object error); -static LRESULT CALLBACK owner_callback (HWND win, UINT msg, - WPARAM wp, LPARAM lp); +static LRESULT CALLBACK ALIGN_STACK owner_callback (HWND win, UINT msg, + WPARAM wp, LPARAM lp); static HWND create_owner (void); static void setup_config (void); @@ -420,7 +420,7 @@ lisp_error_handler (Lisp_Object error) } -static LRESULT CALLBACK +static LRESULT CALLBACK ALIGN_STACK owner_callback (HWND win, UINT msg, WPARAM wp, LPARAM lp) { switch (msg) -- 2.39.5