master 0b0ab33: * src/image.c: Avoid compiler warnings in Cairo builds without XPM.

[Eli Zaretskii]

branch: master
commit 0b0ab33f2de89e56013f60887afbcb9c01f7363d
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    * 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 f2fb69a..d0fc4ed 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);