--- win/share/tile2png.c	2012-11-29 14:13:11.000000000 +0100
+++ win/share/tile2png.c	2012-11-29 14:21:14.000000000 +0100
@@ -26,6 +26,7 @@
 #undef blue
 
 #include <png.h>
+#include <zlib.h>
 #include <assert.h>
 
 
@@ -104,7 +105,7 @@
   /* set error handling since we are using the setjmp/longjmp method
    * (this is the normal method of doing things with libpng).
    */
-  if (setjmp(png_ptr->jmpbuf))
+  if (setjmp(png_jmpbuf(png_ptr)))
   {
     fprintf(stderr, "tile2png: Unknown problem while writing PNG.\n");
     goto failed;

--- win/gl/gl_image.c	2012-11-29 14:49:10.000000000 +0100
+++ win/gl/gl_image.c	2012-11-29 14:49:31.000000000 +0100
@@ -495,7 +495,7 @@
   /* set error handling since we are using the setjmp/longjmp method
    * (this is the normal method of doing things with libpng).
    */
-  if (setjmp(png_ptr->jmpbuf))
+  if (setjmp(png_jmpbuf(png_ptr)))
   {
     sdlgl_warning("Problem within LibPNG (unknown)\n");
     goto failed;