bug#22412: 25.1.50; win32; master branch; build fails; \emacs\src/sysdep.c:2122: undefined reference t

bug#22412: 25.1.50; win32; master branch; build fails; \emacs\src/sysdep.c:2122: undefined reference t

[Keith David Bershatsky]

The current master branch failed to build this evening for Win32 using MinGW.  Here is the point at which the build stops:

***

  GEN      ../../etc/charsets/MULE-tibetan.map
  GEN      ../../etc/charsets/MULE-lviscii.map
  GEN      ../../etc/charsets/MULE-uviscii.map
  GEN      ../../lisp/international/cp51932.el
  GEN      ../../lisp/international/eucjp-ms.el
  GEN      charsets.stamp
make[2]: Leaving directory `/c/docume~1/administrator/desktop/emacs/admin/charse
ts'
make -C ../admin/unidata charscript.el
make[2]: Entering directory `/c/docume~1/administrator/desktop/emacs/admin/unida
ta'
  GEN      ../../lisp/international/charscript.el
make[2]: Leaving directory `/c/docume~1/administrator/desktop/emacs/admin/unidat
a'
  CCLD     temacs.exe
sysdep.o: In function `init_random':
c:\docume~1\administrator\desktop\emacs\src/sysdep.c:2122: undefined reference t
o `w32_init_random'
collect2.exe: error: ld returned 1 exit status
make[1]: *** [temacs.exe] Error 1
make[1]: Leaving directory `/c/docume~1/administrator/desktop/emacs/src'
make: *** [src] Error 2

Thanks,

Keith

bug#22412: 25.1.50; win32; master branch; build fails; \emacs\src/sysdep.c:2122: undefined reference t

[Eli Zaretskii]

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

bug#22412: 25.1.50; win32; master branch; build fails; \emacs\src/sysdep.c:2122: undefined reference t

[Andy Moreton]

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

bug#22412: 25.1.50; win32; master branch; build fails; \emacs\src/sysdep.c:2122: undefined reference t

[Eli Zaretskii]

> From: Andy Moreton <andrewjmoreton@gmail.com>
> Date: Wed, 20 Jan 2016 15:17:44 +0000
> 
> 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:

Fixed, thanks.

bug#22412: 25.1.50; win32; master branch; build fails; \emacs\src/sysdep.c:2122: undefined reference t

[Glenn Morris]

Eli Zaretskii wrote:

> John, something went wrong during the last merge from emacs-25.

Merges would be easier to check if they were more frequent and hence smaller.
Anyone should feel free to do a merge, rather than waiting for one
person to do it. (Part of the sales pitch for changing VCS was that more
people would help out with these sort of tasks, but amazingly nothing's
really changed.)