From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 13 May 2021 09:17:44 +0000 (+0300)
Subject: * src/image.c: Avoid compiler warnings in Cairo builds without XPM.
X-Git-Tag: emacs-28.0.90~2491
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0b0ab33f2de89e56013f60887afbcb9c01f7363d;p=emacs.git

* src/image.c: Avoid compiler warnings in Cairo builds without XPM.
---

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);