From d6721755c7d449829696597312fef11d5a92f2e5 Mon Sep 17 00:00:00 2001 From: Monster Iestyn Date: Mon, 19 Jun 2017 17:00:59 +0100 Subject: [PATCH] I double checked, and yes, png_memcmp/png_memcpy were indeed moved to pngpriv.h in libpng 1.5.0 --- src/m_misc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/m_misc.c b/src/m_misc.c index fa02d77c7..c63233e36 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -89,9 +89,8 @@ typedef off_t off64_t; #endif #if (PNG_LIBPNG_VER_MAJOR > 1) || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5) #define USE_NEW_PNG_EXPORT // PNG_EXPORT is different from 1.5.0 onwards - #endif - #if (PNG_LIBPNG_VER_MAJOR > 1) || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 6) - // 1.6.0 removes these (1.5.0 made them private) + + // 1.5.0 moved these to pngpriv.h (they were later removed in 1.6.0) #define png_memcmp memcmp #define png_memcpy memcpy #endif