diff --git a/src/pngsize.c b/src/pngsize.c
index 23dbce7d5cda53bd9eaf30fa0968a4ba6ba437ba..b937a245dac028b9caf54285d4d25801e750ba0d 100644 (file)
--- a/src/pngsize.c
+++ b/src/pngsize.c
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.3rc5 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010
*****************************************************************************
* pngsize.c determine the size of a PNG image
*****************************************************************************/
*****************************************************************************
* pngsize.c determine the size of a PNG image
*****************************************************************************/
/* this is to make compile on aix work since they seem to define jmpbuf
to be _jmpbuf which breaks compilation */
/* this is to make compile on aix work since they seem to define jmpbuf
to be _jmpbuf which breaks compilation */
+#ifndef png_jmpbuf
+#ifdef PNG_SETJMP_SUPPORTED
+# define png_jmpbuf(png_ptr) ((png_ptr)->PNG_jmpbuf)
+#else
#ifdef jmpbuf
#undef jmpbuf
#endif
#ifdef jmpbuf
#undef jmpbuf
#endif
-
-#ifndef png_jmpbuf
# define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
# define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
+#endif
#endif
if (setjmp(png_jmpbuf(png_read_ptr))) {
#endif
if (setjmp(png_jmpbuf(png_read_ptr))) {