From 0e936f18f8738fbe3809784f5ec6feb27c6bb24e Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Wed, 15 Jan 2020 17:10:30 +0900 Subject: [PATCH] Fix build failure with --with-cairo --without-png * src/image.c: Don't enable PNG section only by USE_CAIRO. --- src/image.c | 8 ++++---- 1 file 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) PNG ***********************************************************************/ -#if defined (HAVE_PNG) || defined (HAVE_NS) || defined (USE_CAIRO) +#if defined (HAVE_PNG) || defined (HAVE_NS) /* Indices of image specification fields in png_format, below. */ @@ -6286,10 +6286,10 @@ png_image_p (Lisp_Object object) return fmt[PNG_FILE].count + fmt[PNG_DATA].count == 1; } -#endif /* HAVE_PNG || HAVE_NS || USE_CAIRO */ +#endif /* HAVE_PNG || HAVE_NS */ -#if (defined HAVE_PNG && !defined HAVE_NS) || defined USE_CAIRO +#if defined HAVE_PNG && !defined HAVE_NS # ifdef WINDOWSNT /* PNG library details. */ @@ -10164,7 +10164,7 @@ static struct image_type const image_types[] = { SYMBOL_INDEX (Qsvg), svg_image_p, svg_load, image_clear_image, IMAGE_TYPE_INIT (init_svg_functions) }, #endif -#if defined HAVE_PNG || defined HAVE_NS || defined USE_CAIRO +#if defined HAVE_PNG || defined HAVE_NS { SYMBOL_INDEX (Qpng), png_image_p, png_load, image_clear_image, IMAGE_TYPE_INIT (init_png_functions) }, #endif -- 2.39.2