From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 27 Jul 2015 12:32:18 +0000 (+0300)
Subject: Fix Cairo build without PNG
X-Git-Tag: emacs-25.0.90~1427
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3266513eb7b7972cc63884338f821ca774a06cfa;p=emacs.git

Fix Cairo build without PNG

* src/image.c: Define PNG function when USE_CAIRO is defined, even
if HAVE_PNG is not.  (Bug#21133)
---

diff --git a/src/image.c b/src/image.c
index cf96cae0385..066db74f786 100644
--- a/src/image.c
+++ b/src/image.c
@@ -5642,7 +5642,7 @@ png_image_p (Lisp_Object object)
 #endif /* HAVE_PNG || HAVE_NS || USE_CAIRO */
 
 
-#if defined HAVE_PNG && !defined HAVE_NS
+#if (defined HAVE_PNG && !defined HAVE_NS) || defined USE_CAIRO
 
 # ifdef WINDOWSNT
 /* PNG library details.  */