On 09/16/2010 08:21 PM, Christoph Gohlke wrote: > > > On 9/16/2010 8:15 PM, Jason Grout wrote: >> On 9/16/10 10:00 PM, Eric Firing wrote: >>> On 09/16/2010 04:12 PM, Jason Grout wrote: >>>> On 9/16/10 9:03 PM, Jason Grout wrote: >>>>> On 9/16/10 8:00 PM, Eric Firing wrote: >>>>> >>>>>>>> I tested your patch with Ubuntu 10.10, and it failed. The problem is >>>>>>>> that something is including setjmp.h before libpng.h tries to do so via >>>>>>>> pngconf.h, resulting in an error as the compiler trips over the >>>>>>>> following: >>>>>>> >>>>>> >>>>>> Python.h includes pyfpe.h which includes setjmp.h. >>>>>> >>>>>> Eric >>>>>> >>>>> >>>>> Ah, good catch. So we just need to include Python.h first, and then set >>>>> that extra #def so that libpng doesn't try to include it? >>>>> >>>>> #include "Python.h" >>>>> #def PNG_SKIP_SETJMP_CHECK >>>>> #include<png.h> >>>>> >>>> >>>> Let me try again: >>>> >>>> In _backend_agg.cpp and _png.cpp, just add >>>> >>>> #define PNG_SKIP_SETJMP_CHECK >>>> >>>> right above >>>> >>>> #include<png.h> >>>> >>>> Does that fix it? >>> >>> Sure does. Your patch with that modification is committed to branch and >>> trunk, 8706, 8707. Thank you! >>> >> >> Did someone check on Windows? I was hoping things wouldn't break in >> WrapPython.h when I switched the order of includes, but you never know... >> >> Jason > > Trunk and 1.0 branch build OK on Windows. Christoph, Once again, thanks very much for testing on Windows. I found a problem on linux (or rather, the buildbot found it because it is running an older version) so I have committed one more change to the branch. If that survives the buildbot, I will propagate it to the trunk, but I don't consider it the last word; I am hoping that someone else can do a better job of cleaning this up. Eric > > -- > Christoph