fix for ticket #121 jmpbuf on aix is a problem it seems, maybe this makes it better.

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1409 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/src/pngsize.c b/program/src/pngsize.c
index 7cdf6c18e86b4c23d6e8c348bd0883acf171a9fe..0f8fd8bf69a9529096d01245e262c3e2db841d99 100644 (file)
--- a/program/src/pngsize.c
+++ b/program/src/pngsize.c
@@ -27,12 +27,15 @@ int PngSize(
 /* 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
-
 #ifndef png_jmpbuf
+#ifdef PNG_SETJMP_SUPPORTED
+#  define png_jmpbuf(png_ptr)   ((png_ptr)->PNG_jmpbuf)
+#else
+#ifdef jmpbuf  
+#undef jmpbuf  
+#endif  
 #  define png_jmpbuf(png_ptr)   ((png_ptr)->jmpbuf)
+#endif
 #endif
 
     if (setjmp(png_jmpbuf(png_read_ptr))) {