[Emacs-diffs] /srv/bzr/emacs/trunk r112146: Fix _setjmp calls for MinGW64.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112146
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2013-03-26 22:30:43 +0200
message:
  Fix _setjmp calls for MinGW64.
  
   nt/config.nt: Don't undefine HAVE__SETJMP here.
   nt/inc/ms-w32.h (HAVE__SETJMP) [_W64]: Undefine for MinGW64 here..
modified:
  nt/ChangeLog
  nt/config.nt
  nt/inc/ms-w32.h

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2013-03-26 17:32:52 +0000
+++ b/nt/ChangeLog      2013-03-26 20:30:43 +0000
@@ -1,9 +1,7 @@
 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.
+       (HAVE__SETJMP) [_W64]: Undefine for MinGW64.
 
        * addsection.c (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT): Do not
        define for MinGW64.

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2013-03-26 17:32:52 +0000
+++ b/nt/config.nt      2013-03-26 20:30:43 +0000
@@ -1143,12 +1143,8 @@
 /* Define to 1 if you have the `_ftime' function. */
 #undef HAVE__FTIME
 
-/* 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 to 1 if _setjmp and _longjmp work.  */
 #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 17:32:52 +0000
+++ b/nt/inc/ms-w32.h   2013-03-26 20:30:43 +0000
@@ -161,6 +161,10 @@
 /* Make sure 'struct timespec' and 'struct timezone' are defined.  */
 #include <sys/types.h>
 #include <time.h>
+/* 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. */
+#undef HAVE__SETJMP
 #endif
 
 #ifdef _MSC_VER