comparison src/image.c @ 105669:68dd71358159

* alloc.c: Do not define struct catchtag. * eval.c: Move struct catchtag definition ... * lisp.h: ... here. * image.c: Move png.h #include earlier to avoid warnings. * xterm.c: * xsmfns.c: * xselect.c: * xrdb.c: * xmenu.c: * xftfont.c: * xfont.c: * xfns.c: * xfaces.c: * xdisp.c: * window.c: * widget.c: * w32xfns.c: * w32uniscribe.c: * w32term.c: * w32select.c: * w32reg.c: * w32proc.c: * w32menu.c: * w32inevt.c: * w32heap.c: * w32font.c: * w32fns.c: * w32console.c: * w32.c: * w16select.c: * vm-limit.c: * unexsol.c: * unexec.c: * unexcw.c: * unexaix.c: * undo.c: * tparam.c: * textprop.c: * terminfo.c: * terminal.c: * termcap.c: * term.c: * syntax.c: * sound.c: * sheap.c: * search.c: * scroll.c: * region-cache.c: * regex.c: * ralloc.c: * process.c: * print.c: * msdos.c: * minibuf.c: * menu.c: * marker.c: * macros.c: * keymap.c: * keyboard.c: * intervals.c: * insdel.c: * indent.c: * gtkutil.c: * ftxfont.c: * ftfont.c: * fringe.c: * frame.c: * fontset.c: * font.c: * fns.c: * floatfns.c: * filelock.c: * fileio.c: * emacs.c: * editfns.c: * dosfns.c: * doprnt.c: * doc.c: * dispnew.c: * dired.c: * dbusbind.c: * data.c: * composite.c: * coding.c: * cmds.c: * cm.c: * chartab.c: * charset.c: * character.c: * ccl.c: * category.c: * casetab.c: * casefiddle.c: * callproc.c: * callint.c: * bytecode.c: * buffer.c: * atimer.c: Include setjmp.h. (Bug#4643) * xlwmenu.c: * lwlib.c: * lwlib-utils.c: * lwlib-Xm.c: * lwlib-Xlw.c: * lwlib-Xaw.c: Include setjmp.h.
author Dan Nicolaescu <dann@ics.uci.edu>
date Mon, 19 Oct 2009 04:27:09 +0000
parents 7690800317e8
children d46b7a138955
comparison
equal deleted inserted replaced
105668:d15f2b6136f5 105669:68dd71358159
24 #include <ctype.h> 24 #include <ctype.h>
25 25
26 #ifdef HAVE_UNISTD_H 26 #ifdef HAVE_UNISTD_H
27 #include <unistd.h> 27 #include <unistd.h>
28 #endif 28 #endif
29
30 #ifdef HAVE_PNG
31 #if defined HAVE_LIBPNG_PNG_H
32 # include <libpng/png.h>
33 #else
34 # include <png.h>
35 #endif
36 #endif
29 37
30 /* This makes the fields of a Display accessible, in Xlib header files. */ 38 /* This makes the fields of a Display accessible, in Xlib header files. */
31 39
32 #define XLIB_ILLEGAL_ACCESS 40 #define XLIB_ILLEGAL_ACCESS
33 41
5785 #endif /* HAVE_PNG || HAVE_NS */ 5793 #endif /* HAVE_PNG || HAVE_NS */
5786 5794
5787 5795
5788 #ifdef HAVE_PNG 5796 #ifdef HAVE_PNG
5789 5797
5790 #if defined HAVE_LIBPNG_PNG_H
5791 # include <libpng/png.h>
5792 #else
5793 # include <png.h>
5794 #endif
5795
5796 #ifdef HAVE_NTGUI 5798 #ifdef HAVE_NTGUI
5797 /* PNG library details. */ 5799 /* PNG library details. */
5798 5800
5799 DEF_IMGLIB_FN (png_get_io_ptr); 5801 DEF_IMGLIB_FN (png_get_io_ptr);
5800 DEF_IMGLIB_FN (png_check_sig); 5802 DEF_IMGLIB_FN (png_check_sig);