diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-03-26 19:32:52 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-03-26 19:32:52 +0200 |
| commit | be3a31b22bb262f57954486ec40f5cbf07a9d828 (patch) | |
| tree | 679ecd486130d0fbefdba70ad3e099c2841ac608 /nt/config.nt | |
| parent | 54e9501092ec8a87991fb3da5b1732c12b43c61e (diff) | |
| download | emacs-be3a31b22bb262f57954486ec40f5cbf07a9d828.tar.gz | |
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.
Diffstat (limited to 'nt/config.nt')
| -rw-r--r-- | nt/config.nt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nt/config.nt b/nt/config.nt index 1fe707cce2d..4f151fcad20 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -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 |