openbsd-ports/comms/pilot-link/patches/patch-src_pilot-read-notepad_c
naddy 8c18b08ac5 Fix build with png-1.5.
All fixes from/via NetBSD pkgsrc.  The people there did a lot of
heavy lifting.
2011-07-08 20:36:09 +00:00

30 lines
760 B
Plaintext

$OpenBSD: patch-src_pilot-read-notepad_c,v 1.1 2011/07/08 20:36:09 naddy Exp $
Fix build with png-1.5.
--- src/pilot-read-notepad.c.orig Thu Jun 4 07:26:19 2009
+++ src/pilot-read-notepad.c Mon Jul 4 15:46:34 2011
@@ -39,11 +39,7 @@
#ifdef HAVE_PNG
#include "png.h"
-#if (PNG_LIBPNG_VER < 10201)
- #define png_voidp_NULL (png_voidp)NULL
- #define png_error_ptr_NULL (png_error_ptr)NULL
#endif
-#endif
const char *progname;
@@ -166,8 +162,8 @@ void write_png( FILE *f, struct NotePad *n )
width = n->body.width + 8;
png_ptr = png_create_write_struct
- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
- png_error_ptr_NULL, png_error_ptr_NULL);
+ ( PNG_LIBPNG_VER_STRING, NULL,
+ NULL, NULL);
if(!png_ptr)
return;