--- pilot-link-0.12.5/src/pilot-read-palmpix.c-orig 2010-10-27 19:43:07.026859208 -0500
+++ pilot-link-0.12.5/src/pilot-read-palmpix.c 2010-10-27 19:43:26.627701808 -0500
@@ -42,10 +42,6 @@
#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;
@@ -223,8 +219,8 @@ void write_png( FILE *f, const struct Pa
png_infop info_ptr;
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;
--- pilot-link-0.12.5/src/pilot-read-notepad.c-orig 2010-10-27 19:42:26.756268392 -0500
+++ pilot-link-0.12.5/src/pilot-read-notepad.c 2010-10-27 19:42:58.022257030 -0500
@@ -39,10 +39,6 @@
#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
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;
--- pilot-link-0.12.5/src/pilot-read-veo.c-orig 2010-10-27 19:44:05.231919740 -0500
+++ pilot-link-0.12.5/src/pilot-read-veo.c 2010-10-27 19:44:20.361054665 -0500
@@ -41,10 +41,6 @@
#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
#define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
@@ -856,8 +852,8 @@ void write_png (FILE * f, struct Veo *v,
png_infop info_ptr;
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;
--- pilot-link-0.12.5/src/pilot-read-screenshot.c-orig 2010-10-27 19:43:34.574118384 -0500
+++ pilot-link-0.12.5/src/pilot-read-screenshot.c 2010-10-27 19:43:53.144112019 -0500
@@ -40,10 +40,6 @@
#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
#define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
@@ -87,8 +83,8 @@ void write_png ( char *fname, struct ss_
gray_buf = malloc( state->w );
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;