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

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 6f208f2a18f6429e2512da7c0d989d0c7d6548e8..f851004f605ead0b3cd5d103dd6ba5221b604ebc 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,9 +1,7 @@
 2013-03-26  Eli Zaretskii  <eliz@gnu.org>
 
        * 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.

diff --git a/nt/config.nt b/nt/config.nt
index 4f151fcad201dce18f0c4c9ea1b5dbc9702d9e46..3d606258fc097cdcfc01f7b262a23c36cef49613 100644 (file)
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1143,12 +1143,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* 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

diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index fd18e8fd1dae1a5cefde7b03bf9f5d4c97310956..a2111da6f3ea5049c1c980465100d421c1267475 100644 (file)
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -161,6 +161,10 @@ extern char *getenv ();
 /* 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