From eed1888ade8274b106b06a55af29ef9cd33c5917 Mon Sep 17 00:00:00 2001
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Date: Wed, 18 May 2016 02:19:55 -0400
Subject: Fix libpng1.5 issue, keeping backword-compatible code, from Debian

---
diff --git a/xcf2png.c b/xcf2png.c
index e8b5c1a..6721f3d 100644
--- a/xcf2png.c
+++ b/xcf2png.c
@@ -59,7 +59,14 @@ my_error_callback(png_structp png_ptr, png_const_charp errormsg)
   FatalUnexpected(_("Libpng error '%s'"),errormsg);
 }
 
-  
+#ifndef png_voidp_NULL
+#define png_voidp_NULL	NULL
+#endif
+
+#ifndef png_error_ptr_NULL
+#define png_error_ptr_NULL	NULL
+#endif
+
 static void
 init_output(void)
 {
@@ -71,9 +78,9 @@ init_output(void)
   
   outfile = openout(flatspec.output_filename);
   libpng = png_create_write_struct(PNG_LIBPNG_VER_STRING,
-                                   NULL,
+                                   png_voidp_NULL,
                                    my_error_callback,
-                                   NULL);
+                                   png_error_ptr_NULL);
   if( !libpng )
     FatalUnexpected(_("Couldn't initialize libpng library"));
   
--
cgit v0.9.1