Imported upstream version 1.2.28.

[pkg-rrdtool.git] / src / pngsize.c

diff --git a/src/pngsize.c b/src/pngsize.c
index c9254d48f65f915ed315848df78939effd9f1dc6..ec95f985e2117f8b015cd523d041c6ce6e621b89 100644 (file)
--- a/src/pngsize.c
+++ b/src/pngsize.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.27  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.2.28  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * pngsize.c  determine the size of a PNG image
  *****************************************************************************/
@@ -25,12 +25,16 @@ PngSize(FILE *fd, long *width, long *height)
 /* 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
-
-#ifndef png_jmpbuf
 #  define png_jmpbuf(png_ptr)   ((png_ptr)->jmpbuf)
+#endif
 #endif
 
   if (setjmp(png_jmpbuf(png_read_ptr))){