--- src/pilot-read-notepad.c.orig	2009-06-04 23:26:19.000000000 +1000
+++ src/pilot-read-notepad.c	2011-01-17 21:07:32.000000000 +1100
@@ -39,7 +39,7 @@
 
 #ifdef HAVE_PNG
 #include "png.h"
-#if (PNG_LIBPNG_VER < 10201)
+#if (PNG_LIBPNG_VER < 10201 || PNG_LIBPNG_VER >= 10400)
  #define png_voidp_NULL (png_voidp)NULL
  #define png_error_ptr_NULL (png_error_ptr)NULL
 #endif
--- src/pilot-read-palmpix.c.orig	2009-06-04 23:26:19.000000000 +1000
+++ src/pilot-read-palmpix.c	2011-01-17 21:08:43.000000000 +1100
@@ -42,7 +42,7 @@
 
 #ifdef HAVE_PNG
 #include "png.h"
-#if (PNG_LIBPNG_VER < 10201)
+#if (PNG_LIBPNG_VER < 10201 || PNG_LIBPNG_VER >= 10400)
  #define png_voidp_NULL (png_voidp)NULL
  #define png_error_ptr_NULL (png_error_ptr)NULL
 #endif
--- src/pilot-read-screenshot.c.orig	2009-06-04 23:26:19.000000000 +1000
+++ src/pilot-read-screenshot.c	2011-01-17 21:09:46.000000000 +1100
@@ -40,7 +40,7 @@
 
 #ifdef HAVE_PNG
 # include "png.h"
-# if (PNG_LIBPNG_VER < 10201)
+# if (PNG_LIBPNG_VER < 10201 || PNG_LIBPNG_VER >= 10400)
 #  define png_voidp_NULL (png_voidp)NULL
 #  define png_error_ptr_NULL (png_error_ptr)NULL
 # endif
--- src/pilot-read-veo.c.orig	2009-06-04 23:26:19.000000000 +1000
+++ src/pilot-read-veo.c	2011-01-17 21:10:32.000000000 +1100
@@ -41,7 +41,7 @@
 
 #ifdef HAVE_PNG
 # include "png.h"
-# if (PNG_LIBPNG_VER < 10201)
+# if (PNG_LIBPNG_VER < 10201 || PNG_LIBPNG_VER >= 10400)
 #  define png_voidp_NULL (png_voidp)NULL
 #  define png_error_ptr_NULL (png_error_ptr)NULL
 # endif