From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 19 Jan 2016 16:11:04 +0000 (+0200)
Subject: Unbreak the Cygwin-w32 build
X-Git-Tag: emacs-25.0.90~125
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=32cb203c086163e40ecc040e61e5d304e101b602;p=emacs.git

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)
---

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)
   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 ();