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.

2 files changed, 8 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f9d31b08abd..c6c314b9589 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port _setjmp fix to POSIXish hosts as well as Microsoft.
+        * 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.
+
 2012-09-15  Eli Zaretskii  <eliz@gnu.org>
 
         * w32xfns.c:
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)
    MinGW (MS-Windows) uses _setjmp and defines setjmp to _setjmp in
    the system header setjmp.h; don't mess up that.  */
 #ifndef HAVE__SETJMP
-# ifndef setjmp
-#  define _setjmp(j) setjmp (j)
-# endif
+# define _setjmp(j) setjmp (j)
 # define _longjmp longjmp
 #endif