diff options
| author | Eli Zaretskii | 2014-10-18 09:40:04 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-10-18 09:40:04 +0300 |
| commit | 4b6d6e69098ec2c823b637a82e1c3fb10539f7b0 (patch) | |
| tree | 3523e73193a814d79a49246d639e8d9101b6f03c /src | |
| parent | 6c854f07d1a6cbe46bd5a5a9dd3910c87b418d93 (diff) | |
| download | emacs-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/ChangeLog | 4 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2014-10-18 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * w32select.c (owner_callback): Mark with ALIGN_STACK attribute. | ||
| 4 | |||
| 1 | 2014-10-17 Eli Zaretskii <eliz@gnu.org> | 5 | 2014-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); | |||
| 95 | static Lisp_Object render_all (Lisp_Object ignore); | 95 | static Lisp_Object render_all (Lisp_Object ignore); |
| 96 | static void run_protected (Lisp_Object (*code) (Lisp_Object), Lisp_Object arg); | 96 | static void run_protected (Lisp_Object (*code) (Lisp_Object), Lisp_Object arg); |
| 97 | static Lisp_Object lisp_error_handler (Lisp_Object error); | 97 | static Lisp_Object lisp_error_handler (Lisp_Object error); |
| 98 | static LRESULT CALLBACK owner_callback (HWND win, UINT msg, | 98 | static LRESULT CALLBACK ALIGN_STACK owner_callback (HWND win, UINT msg, |
| 99 | WPARAM wp, LPARAM lp); | 99 | WPARAM wp, LPARAM lp); |
| 100 | static HWND create_owner (void); | 100 | static HWND create_owner (void); |
| 101 | 101 | ||
| 102 | static void setup_config (void); | 102 | static void setup_config (void); |
| @@ -420,7 +420,7 @@ lisp_error_handler (Lisp_Object error) | |||
| 420 | } | 420 | } |
| 421 | 421 | ||
| 422 | 422 | ||
| 423 | static LRESULT CALLBACK | 423 | static LRESULT CALLBACK ALIGN_STACK |
| 424 | owner_callback (HWND win, UINT msg, WPARAM wp, LPARAM lp) | 424 | owner_callback (HWND win, UINT msg, WPARAM wp, LPARAM lp) |
| 425 | { | 425 | { |
| 426 | switch (msg) | 426 | switch (msg) |