diff options
| author | Paul Eggert | 2012-09-15 01:45:27 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-09-15 01:45:27 -0700 |
| commit | 39a57ad07b0521dd6dbcae9cd4996366aa59e1ba (patch) | |
| tree | 77b103843b2a91952b3df49682ae278d2dfae54a /src/image.c | |
| parent | 7105c8cbf3a3226701e4d2ecb0b9c2d207648a98 (diff) | |
| download | emacs-39a57ad07b0521dd6dbcae9cd4996366aa59e1ba.tar.gz emacs-39a57ad07b0521dd6dbcae9cd4996366aa59e1ba.zip | |
Port _setjmp fix to POSIXish hosts as well as Microsoft.
* nt/config.nt: Attempt to sync with autogen/config.in.
(HAVE_SIGSETJMP, HAVE__SETJMP): New macros.
(_longjmp, _setjmp): Remove.
* src/image.c (_setjmp) [!HAVE__SETJMP]: Restore definition, as
it's needed on POSIXish hosts that lack _setjmp. Attempt to solve
the Microsoft problem in a different way, by altering nt/config.nt.
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/image.c b/src/image.c index 02151c500cc..8fc1c8637eb 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -5520,9 +5520,7 @@ init_png_functions (Lisp_Object libraries) | |||
| 5520 | MinGW (MS-Windows) uses _setjmp and defines setjmp to _setjmp in | 5520 | MinGW (MS-Windows) uses _setjmp and defines setjmp to _setjmp in |
| 5521 | the system header setjmp.h; don't mess up that. */ | 5521 | the system header setjmp.h; don't mess up that. */ |
| 5522 | #ifndef HAVE__SETJMP | 5522 | #ifndef HAVE__SETJMP |
| 5523 | # ifndef setjmp | 5523 | # define _setjmp(j) setjmp (j) |
| 5524 | # define _setjmp(j) setjmp (j) | ||
| 5525 | # endif | ||
| 5526 | # define _longjmp longjmp | 5524 | # define _longjmp longjmp |
| 5527 | #endif | 5525 | #endif |
| 5528 | 5526 | ||