[Emacs-diffs] trunk r117070: * image.c: Include <png.h> before <setjmp.h>.

[Paul Eggert]

------------------------------------------------------------
revno: 117070
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17429
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2014-05-07 11:20:18 -0700
message:
  * image.c: Include <png.h> before <setjmp.h>.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-05-06 21:13:37 +0000
+++ b/src/ChangeLog     2014-05-07 18:20:18 +0000
@@ -1,3 +1,7 @@
+2014-05-07  Paul Eggert  <address@hidden>
+
+       * image.c: Include <png.h> before <setjmp.h> (Bug#17429).
+
 2014-05-06  Paul Eggert  <address@hidden>
 
        * image.c: Do not use libpng if HAVE_NS, as NS does its own thing.

=== modified file 'src/image.c'
--- a/src/image.c       2014-05-06 21:13:37 +0000
+++ b/src/image.c       2014-05-07 18:20:18 +0000
@@ -21,6 +21,12 @@
 #include "sysstdio.h"
 #include <unistd.h>
 
+/* Include this before including <setjmp.h> to work around bugs with
+   older libpng; see Bug#17429.  */
+#if defined HAVE_PNG && !defined HAVE_NS
+# include <png.h>
+#endif
+
 #include <setjmp.h>
 #include <c-ctype.h>
 
@@ -5512,8 +5518,6 @@
 
 #if defined HAVE_PNG && !defined HAVE_NS
 
-#include <png.h>
-
 #ifdef WINDOWSNT
 /* PNG library details.  */