Merged revisions 8736 via svnmerge from

mdboom · mdboom · commit 7fe5dd5e7d6b · 2010-10-08T18:16:54.000Z
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint ........ r8736 | mdboom | 2010-10-08 14:16:15 -0400 (Fri, 08 Oct 2010) | 2 lines [3082058] build _png.so on aix ........ svn path=/trunk/matplotlib/; revision=8737
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -27,6 +27,11 @@
 #include "numpy/arrayobject.h"
 #include "mplutils.h"
 
+// As reported in [3082058] build _png.so on aix
+#ifdef _AIX
+#undef jmpbuf
+#endif
+
 // the extension module
 class _png_module : public Py::ExtensionModule<_png_module>
 {
@@ -163,7 +168,7 @@ Py::Object _png_module::write_png(const Py::Tuple& args)
             throw Py::RuntimeError("Could not create info struct");
         }
 
-        if (setjmp(png_ptr->jmpbuf))
+        if (setjmp(png_jmpbuf(png_ptr)))
         {
             throw Py::RuntimeError("Error building image");
         }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,11 @@`
`27`	`27`	`#include "numpy/arrayobject.h"`
`28`	`28`	`#include "mplutils.h"`
`29`	`29`
	`30`	`+// As reported in [3082058] build _png.so on aix`
	`31`	`+#ifdef _AIX`
	`32`	`+#undef jmpbuf`
	`33`	`+#endif`
	`34`	`+`
`30`	`35`	`// the extension module`
`31`	`36`	`class _png_module : public Py::ExtensionModule<_png_module>`
`32`	`37`	`{`
`@@ -163,7 +168,7 @@ Py::Object _png_module::write_png(const Py::Tuple& args)`
`163`	`168`	`throw Py::RuntimeError("Could not create info struct");`
`164`	`169`	`}`
`165`	`170`
`166`		`- if (setjmp(png_ptr->jmpbuf))`
	`171`	`+ if (setjmp(png_jmpbuf(png_ptr)))`
`167`	`172`	`{`
`168`	`173`	`throw Py::RuntimeError("Error building image");`
`169`	`174`	`}`