--- src/image.c.orig	2008-01-15 15:36:48.000000000 +1100
+++ src/image.c	2012-05-09 15:05:24.000000000 +1000
@@ -120,7 +120,7 @@ readpng (void *buf, int *width, int *hei
 
     png_read_png (png_ptr, info_ptr,
 	PNG_TRANSFORM_PACKING | PNG_TRANSFORM_STRIP_16 |
-	PNG_TRANSFORM_EXPAND, png_voidp_NULL);
+	PNG_TRANSFORM_EXPAND, (png_voidp)NULL);
     pitch = png_get_rowbytes (png_ptr, info_ptr);
     *width = png_get_image_width (png_ptr, info_ptr);
     *height = png_get_image_height (png_ptr, info_ptr);
@@ -133,6 +133,6 @@ readpng (void *buf, int *width, int *hei
     out = malloc ((*width) * (*height) * (*bpp));
     for (i = 0; i < info_ptr->height; ++i)
 	memcpy ((void *)((size_t)out + i * pitch), row_pointers[i], pitch);
-    png_destroy_read_struct (&png_ptr, &info_ptr, png_infopp_NULL);
+    png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);
     return out;
 }