From 4786c02b83a521bb35f8928dac33a884b6ca7cfa Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 20 Jan 2016 19:34:27 +0200
Subject: [PATCH] Anoter fix for problematic merge from emacs-25

* src/w32fns.c (globals_of_w32fns): Move initialization of
resetstkoflw to a non-Cygwin part.
---
 src/w32fns.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/w32fns.c b/src/w32fns.c
index 01f5d6f3ae..a5018ae9d3 100644
--- 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);
+  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 ();
 
-- 
2.39.2