aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2015-07-27 15:32:18 +0300
committerEli Zaretskii2015-07-27 15:32:18 +0300
commit3266513eb7b7972cc63884338f821ca774a06cfa (patch)
tree9e8c1c846783bfe6dd258ce8d064bcf509c23ff2 /src
parent70096743d5bed2c4c0221da32ebf824ad6a262c5 (diff)
downloademacs-3266513eb7b7972cc63884338f821ca774a06cfa.tar.gz
emacs-3266513eb7b7972cc63884338f821ca774a06cfa.zip
Fix Cairo build without PNG
* src/image.c: Define PNG function when USE_CAIRO is defined, even if HAVE_PNG is not. (Bug#21133)
Diffstat (limited to 'src')
-rw-r--r--src/image.c2
1 files changed, 1 insertions, 1 deletions
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)
5642#endif /* HAVE_PNG || HAVE_NS || USE_CAIRO */ 5642#endif /* HAVE_PNG || HAVE_NS || USE_CAIRO */
5643 5643
5644 5644
5645#if defined HAVE_PNG && !defined HAVE_NS 5645#if (defined HAVE_PNG && !defined HAVE_NS) || defined USE_CAIRO
5646 5646
5647# ifdef WINDOWSNT 5647# ifdef WINDOWSNT
5648/* PNG library details. */ 5648/* PNG library details. */