Index: code/pngutils/pngutils.cpp
===================================================================
--- code/pngutils/pngutils.cpp	(revision 6012)
+++ code/pngutils/pngutils.cpp	(working copy)
@@ -10,6 +10,13 @@
 #include "palman/palman.h"
 #include "graphics/2d.h"
 
+#ifndef png_infopp_NULL
+#define png_infopp_NULL NULL
+#endif
+#ifndef png_voidp_NULL
+#define png_voidp_NULL NULL
+#endif
+
 CFILE *png_file = NULL;
 
 //copy/pasted from libpng