[libpng16] Add #include <setjmp.h> to contrib/tools/pngfix.c to allow "make" to

complete without setjmp support (bug report by Claudio Fontana)

ANNOUNCE

-Libpng 1.6.14beta01 - September 10, 2014
+Libpng 1.6.14beta01 - September 11, 2014
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -25,11 +25,10 @@ Other information:
 
 Changes since the last public release (1.6.13):
 
-Version 1.6.14beta01 [September 10, 2014]
+Version 1.6.14beta01 [September 11, 2014]
   Guard usage of png_ptr->options with #ifdef PNG_SET_OPTION_SUPPORTED.
-  Add #ifdef PNG_SETJMP_SUPPORTED where needed in contrib/tools/pngfix.c
-    to allow "make all" to complete without setjmp support (bug report
-    by Claudio Fontana)
+  Add #include <setjmp.h> to contrib/tools/pngfix.c to allow "make" to
+    complete without setjmp support (bug report by Claudio Fontana)
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

CHANGES

@@ -4978,11 +4978,10 @@ Version 1.6.13rc01 [August 14, 2014]
 Version 1.6.13 [August 21, 2014]
   No changes.
 
-Version 1.6.14beta01 [September 10, 2014]
+Version 1.6.14beta01 [September 11, 2014]
   Guard usage of png_ptr->options with #ifdef PNG_SET_OPTION_SUPPORTED.
-  Add #ifdef PNG_SETJMP_SUPPORTED where needed in contrib/tools/pngfix.c
-    to allow "make all" to complete without setjmp support (bug report
-    by Claudio Fontana)
+  Add #include <setjmp.h> to contrib/tools/pngfix.c to allow "make" to
+    complete without setjmp support (bug report by Claudio Fontana)
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

contrib/tools/pngfix.c

@@ -18,6 +18,7 @@
 #include <limits.h>
 #include <errno.h>
 #include <assert.h>
+#include <setjmp.h>
 
 #define implies(x,y) assert(!(x) || (y))
 
@@ -49,7 +50,6 @@
 #  error "pngfix will not work with libpng prior to 1.6.3"
 #endif
 
-#ifdef PNG_SETJMP_SUPPORTED
 #if defined(PNG_READ_SUPPORTED) && defined(PNG_EASY_ACCESS_SUPPORTED)
 /* zlib.h defines the structure z_stream, an instance of which is included
  * in this structure and is required for decompressing the LZ compressed
@@ -4035,12 +4035,3 @@ main(void)
    return 77;
 }
 #endif /* PNG_READ_SUPPORTED && PNG_EASY_ACCESS_SUPPORTED */
-#else /* No setjmp support */
-int
-main(void)
-{
-   fprintf(stderr, "pngfix does not work without setjmp support\n");
-   return 77;
-}
-#endif /* PNG_SETJMP_SUPPORTED */
-