[Emacs-diffs] /srv/bzr/emacs/trunk r112145: Fix problem with _setjmp in MinGW64-compiled Emacs.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112145
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2013-03-26 19:32:52 +0200
message:
  Fix problem with _setjmp in MinGW64-compiled Emacs.
  
   nt/inc/ms-w32.h (USE_NO_MINGW_SETJMP_TWO_ARGS): Don't define.
   nt/config.nt (HAVE__SETJMP) [!_W64]: Don't define for MinGW64, as
   its _setjmp accepts 2 arguments.
modified:
  nt/ChangeLog
  nt/config.nt
  nt/inc/ms-w32.h

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2013-03-26 14:26:24 +0000
+++ b/nt/ChangeLog      2013-03-26 17:32:52 +0000
@@ -1,5 +1,10 @@
 2013-03-26  Eli Zaretskii  <address@hidden>
 
+       * inc/ms-w32.h (USE_NO_MINGW_SETJMP_TWO_ARGS): Don't define.
+
+       * config.nt (HAVE__SETJMP) [!_W64]: Don't define for MinGW64, as
+       its _setjmp accepts 2 arguments.
+
        * addsection.c (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT): Do not
        define for MinGW64.
 

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2013-03-15 17:12:03 +0000
+++ b/nt/config.nt      2013-03-26 17:32:52 +0000
@@ -1143,8 +1143,12 @@
 /* Define to 1 if you have the `_ftime' function. */
 #undef HAVE__FTIME
 
-/* Define to 1 if _setjmp and _longjmp work. */
+/* Define to 1 if _setjmp and _longjmp work.  MinGW64 uses a
+   2-argument _setjmp, and setjmp is a macro defined to supply the 2nd
+   arg correctly, so don't use _setjmp directly in that case.  */
+#ifndef _W64
 #define HAVE__SETJMP 1
+#endif
 
 /* Define to 1 if you have the `__builtin_unwind_init' function. */
 #undef HAVE___BUILTIN_UNWIND_INIT

=== modified file 'nt/inc/ms-w32.h'
--- a/nt/inc/ms-w32.h   2013-03-26 13:45:01 +0000
+++ b/nt/inc/ms-w32.h   2013-03-26 17:32:52 +0000
@@ -158,7 +158,6 @@
 
 #ifdef _W64
 /* MinGW64 specific stuff.  */
-#define USE_NO_MINGW_SETJMP_TWO_ARGS 1
 /* Make sure 'struct timespec' and 'struct timezone' are defined.  */
 #include <sys/types.h>
 #include <time.h>