Commit be3a31b2 authored by Eli Zaretskii's avatar Eli Zaretskii

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.
parent 54e95010
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.
* addsection.c (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT): Do not
define for MinGW64.
......
......@@ -1143,8 +1143,12 @@ 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. */
/* 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
......
......@@ -158,7 +158,6 @@ extern char *getenv ();
#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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment