procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* image.c: Include <png.h> before <setjmp.h>.

Browse source 
Fixes: debbugs:17429
This commit is contained in:
Paul Eggert 2014-05-07 11:20:18 -07:00
parent 98e12950ae
commit 1ba38c429f
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2014-05-07 Paul Eggert <eggert@cs.ucla.edu>
* image.c: Include <png.h> before <setjmp.h> (Bug#17429).
2014-05-06 Paul Eggert <eggert@cs.ucla.edu>
* image.c: Do not use libpng if HAVE_NS, as NS does its own thing.

8
src/image.c
View file

@ -21,6 +21,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#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 @@ png_image_p (Lisp_Object object)
#if defined HAVE_PNG && !defined HAVE_NS
#include <png.h>
#ifdef WINDOWSNT
/* PNG library details. */