aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2016-01-19 18:11:04 +0200
committerEli Zaretskii2016-01-19 18:11:04 +0200
commit32cb203c086163e40ecc040e61e5d304e101b602 (patch)
treee99ade91c373104e2ecf00bee769ecd3004fd0ba
parent116caedbe0da17999a3636e4def329edab2c56ed (diff)
downloademacs-32cb203c086163e40ecc040e61e5d304e101b602.tar.gz
emacs-32cb203c086163e40ecc040e61e5d304e101b602.zip
Unbreak the Cygwin-w32 build
* src/w32fns.c (globals_of_w32fns): Move the initialization of resetstkoflw into a part that isn't compiled on Cygwin. (Bug#22403)
-rw-r--r--src/w32fns.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/w32fns.c b/src/w32fns.c
index 01f5d6f3ae0..a5018ae9d30 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -9921,6 +9921,7 @@ globals_of_w32fns (void)
9921 except_addr = 0; 9921 except_addr = 0;
9922#ifndef CYGWIN 9922#ifndef CYGWIN
9923 prev_exception_handler = SetUnhandledExceptionFilter (my_exception_handler); 9923 prev_exception_handler = SetUnhandledExceptionFilter (my_exception_handler);
9924 resetstkoflw = NULL;
9924#endif 9925#endif
9925 9926
9926 DEFVAR_INT ("w32-ansi-code-page", 9927 DEFVAR_INT ("w32-ansi-code-page",
@@ -9935,8 +9936,6 @@ globals_of_w32fns (void)
9935 9936
9936 after_deadkey = -1; 9937 after_deadkey = -1;
9937 9938
9938 resetstkoflw = NULL;
9939
9940 /* MessageBox does not work without this when linked to comctl32.dll 6.0. */ 9939 /* MessageBox does not work without this when linked to comctl32.dll 6.0. */
9941 InitCommonControls (); 9940 InitCommonControls ();
9942 9941