From 0b0ab33f2de89e56013f60887afbcb9c01f7363d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 13 May 2021 12:17:44 +0300 Subject: [PATCH] * src/image.c: Avoid compiler warnings in Cairo builds without XPM. --- src/image.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/image.c b/src/image.c index f2fb69ab743..d0fc4ed741b 100644 --- a/src/image.c +++ b/src/image.c @@ -4706,10 +4706,11 @@ xpm_load (struct frame *f, struct image *img) #endif /* HAVE_XPM && !USE_CAIRO */ -#if defined USE_CAIRO || (defined HAVE_NS && !defined HAVE_XPM) +#if (defined USE_CAIRO && defined HAVE_XPM) \ + || (defined HAVE_NS && !defined HAVE_XPM) -/* XPM support functions for NS where libxpm is not available. - Only XPM version 3 (without any extensions) is supported. */ +/* XPM support functions for NS where libxpm is not available, and for + Cairo. Only XPM version 3 (without any extensions) is supported. */ static void xpm_put_color_table_v (Lisp_Object, const char *, int, Lisp_Object); -- 2.39.5