aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2020-01-15 17:10:30 +0900
committerYAMAMOTO Mitsuharu2020-01-15 17:10:30 +0900
commit0e936f18f8738fbe3809784f5ec6feb27c6bb24e (patch)
tree8435b47b04d3d80e9143b0de957e88a119f8a7da /src
parentc34f7e884b2dfd867aaf1178941c314ac739f781 (diff)
downloademacs-0e936f18f8738fbe3809784f5ec6feb27c6bb24e.tar.gz
emacs-0e936f18f8738fbe3809784f5ec6feb27c6bb24e.zip
Fix build failure with --with-cairo --without-png
* src/image.c: Don't enable PNG section only by USE_CAIRO.
Diffstat (limited to 'src')
-rw-r--r--src/image.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/image.c b/src/image.c
index e36253b3960..56878bcb8cb 100644
--- a/src/image.c
+++ b/src/image.c
@@ -6235,7 +6235,7 @@ pbm_load (struct frame *f, struct image *img)
6235 PNG 6235 PNG
6236 ***********************************************************************/ 6236 ***********************************************************************/
6237 6237
6238#if defined (HAVE_PNG) || defined (HAVE_NS) || defined (USE_CAIRO) 6238#if defined (HAVE_PNG) || defined (HAVE_NS)
6239 6239
6240/* Indices of image specification fields in png_format, below. */ 6240/* Indices of image specification fields in png_format, below. */
6241 6241
@@ -6286,10 +6286,10 @@ png_image_p (Lisp_Object object)
6286 return fmt[PNG_FILE].count + fmt[PNG_DATA].count == 1; 6286 return fmt[PNG_FILE].count + fmt[PNG_DATA].count == 1;
6287} 6287}
6288 6288
6289#endif /* HAVE_PNG || HAVE_NS || USE_CAIRO */ 6289#endif /* HAVE_PNG || HAVE_NS */
6290 6290
6291 6291
6292#if (defined HAVE_PNG && !defined HAVE_NS) || defined USE_CAIRO 6292#if defined HAVE_PNG && !defined HAVE_NS
6293 6293
6294# ifdef WINDOWSNT 6294# ifdef WINDOWSNT
6295/* PNG library details. */ 6295/* PNG library details. */
@@ -10164,7 +10164,7 @@ static struct image_type const image_types[] =
10164 { SYMBOL_INDEX (Qsvg), svg_image_p, svg_load, image_clear_image, 10164 { SYMBOL_INDEX (Qsvg), svg_image_p, svg_load, image_clear_image,
10165 IMAGE_TYPE_INIT (init_svg_functions) }, 10165 IMAGE_TYPE_INIT (init_svg_functions) },
10166#endif 10166#endif
10167#if defined HAVE_PNG || defined HAVE_NS || defined USE_CAIRO 10167#if defined HAVE_PNG || defined HAVE_NS
10168 { SYMBOL_INDEX (Qpng), png_image_p, png_load, image_clear_image, 10168 { SYMBOL_INDEX (Qpng), png_image_p, png_load, image_clear_image,
10169 IMAGE_TYPE_INIT (init_png_functions) }, 10169 IMAGE_TYPE_INIT (init_png_functions) },
10170#endif 10170#endif