Anoter fix for problematic merge from emacs-25

* src/w32fns.c (globals_of_w32fns): Move initialization of
resetstkoflw to a non-Cygwin part.
This commit is contained in:
Eli Zaretskii 2016-01-20 19:34:27 +02:00
parent 1d5f46b20e
commit 4786c02b83

View file

@ -9921,6 +9921,7 @@ globals_of_w32fns (void)
except_addr = 0;
#ifndef CYGWIN
prev_exception_handler = SetUnhandledExceptionFilter (my_exception_handler);
resetstkoflw = NULL;
#endif
DEFVAR_INT ("w32-ansi-code-page",
@ -9935,8 +9936,6 @@ globals_of_w32fns (void)
after_deadkey = -1;
resetstkoflw = NULL;
/* MessageBox does not work without this when linked to comctl32.dll 6.0. */
InitCommonControls ();