Anoter fix for problematic merge from emacs-25

* src/w32fns.c (globals_of_w32fns): Move initialization of
resetstkoflw to a non-Cygwin part.

diff --git a/src/w32fns.c b/src/w32fns.c
index 01f5d6f3ae0f3c2cd5d246f5b91d5a60a04e0843..a5018ae9d30d798e34694df01c2527a0e35347bf 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -9921,6 +9921,7 @@ globals_of_w32fns (void)
   except_addr = 0;
 #ifndef CYGWIN
   prev_exception_handler = SetUnhandledExceptionFilter (my_exception_handler);
   except_addr = 0;
 #ifndef CYGWIN
   prev_exception_handler = SetUnhandledExceptionFilter (my_exception_handler);

+  resetstkoflw = NULL;

 #endif
 
   DEFVAR_INT ("w32-ansi-code-page",
 #endif
 
   DEFVAR_INT ("w32-ansi-code-page",


@@ -9935,8 +9936,6 @@ globals_of_w32fns (void)
 
   after_deadkey = -1;
 
 
   after_deadkey = -1;
 

-  resetstkoflw = NULL;
-

   /* MessageBox does not work without this when linked to comctl32.dll 6.0.  */
   InitCommonControls ();
 
   /* MessageBox does not work without this when linked to comctl32.dll 6.0.  */
   InitCommonControls ();