From: André Hentschel <nerv@dawncrow.de>
Subject: windowscodecs: Fix compilation without libpng
Message-Id: <53CEAFCA.7090803@dawncrow.de>
Date: Tue, 22 Jul 2014 20:39:06 +0200

Also found with 64-bit Android toolchain

---
 dlls/windowscodecs/pngformat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c
index a8ecb73..245910b 100644
--- a/dlls/windowscodecs/pngformat.c
+++ b/dlls/windowscodecs/pngformat.c
@@ -21,7 +21,7 @@
  #include <stdarg.h>
 -#ifdef HAVE_PNG_H
+#if defined(HAVE_PNG_H) && defined(SONAME_LIBPNG)
 #include <png.h>
 #endif
 @@ -1762,7 +1762,7 @@ HRESULT PngEncoder_CreateInstance(REFIID iid,
void** ppv)
     return ret;
 }
 -#else /* !HAVE_PNG_H */
+#else /* SONAME_LIBPNG */
  HRESULT PngDecoder_CreateInstance(REFIID iid, void** ppv)
 {
-- 
1.9.1