[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#22412: 25.1.50; win32; master branch; build fails; \emacs\src/sysdep
From: |
Andy Moreton |
Subject: |
bug#22412: 25.1.50; win32; master branch; build fails; \emacs\src/sysdep.c:2122: undefined reference t |
Date: |
Wed, 20 Jan 2016 15:17:44 +0000 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (windows-nt) |
On Wed 20 Jan 2016, Eli Zaretskii wrote:
>> Date: Tue, 19 Jan 2016 22:02:12 -0800
>> From: Keith David Bershatsky <esq@lawlist.com>
>>
>> The current master branch failed to build this evening for Win32
>> using MinGW.
>
> Thanks, fixed.
>
> John, something went wrong during the last merge from emacs-25.
Indeed. Master needs another fix for the cygwin-w32 build:
diff --git a/src/w32fns.c b/src/w32fns.c
index 01f5d6f3ae0f..93ff1da2a228 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,7 +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 ();