X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpngsize.c;h=136e36874387590e95c4b0c786801e7b22669411;hb=9de2c927a66ef40e99c1c20d135f6ae484c6153c;hp=41ff16ab14f3ea4de9d962b447ee4fea9204339f;hpb=285da1fa16e80919db972b1d7021c0b4705bedb1;p=rrdtool.git

diff --git a/src/pngsize.c b/src/pngsize.c
index 41ff16a..136e368 100644
--- a/src/pngsize.c
+++ b/src/pngsize.c
@@ -1,10 +1,11 @@
 /*****************************************************************************
- * RRDtool 1.1.x  Copyright Tobias Oetiker, 1997 - 2002
+ * RRDtool 1.2.15  Copyright by Tobi Oetiker, 1997-2006
  *****************************************************************************
  * pngsize.c  determine the size of a PNG image
  *****************************************************************************/
 
 #include <png.h>
+#include "rrd_tool.h"
 
 int
 PngSize(FILE *fd, long *width, long *height)
@@ -21,6 +22,13 @@ PngSize(FILE *fd, long *width, long *height)
   (*width)=0;
   (*height)=0;
 
+/* this is to make compile on aix work since they seem to define jmpbuf
+   to be _jmpbuf which breaks compilation */
+
+#ifdef jmpbuf
+#undef jmpbuf
+#endif
+
   if (setjmp(png_read_ptr->jmpbuf)){
     png_destroy_read_struct(&png_read_ptr, &info_ptr, (png_infopp)NULL);
     return 0;