From: Yuuki Harano <masm+github@masm11.me>
Date: Wed, 19 May 2021 14:06:56 +0000 (+0900)
Subject: * src/image.c: Fix compile error related xpm in image.c
X-Git-Tag: emacs-29.0.90~3697
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=82b4ea2fe820e3e49fb500cb220df60186f298c6;p=emacs.git

* src/image.c: Fix compile error related xpm in image.c

Use the same code as NS.
---

diff --git a/src/image.c b/src/image.c
index 67c55ea9ea1..9b8b7d97bda 100644
--- a/src/image.c
+++ b/src/image.c
@@ -4191,7 +4191,7 @@ enum xpm_keyword_index
   XPM_LAST
 };
 
-#if defined HAVE_XPM || defined HAVE_NS
+#if defined HAVE_XPM || defined HAVE_NS || defined HAVE_PGTK
 /* Vector of image_keyword structures describing the format
    of valid XPM image specifications.  */
 
@@ -4433,7 +4433,7 @@ init_xpm_functions (void)
 
 #endif /* WINDOWSNT */
 
-#if defined HAVE_XPM || defined HAVE_NS
+#if defined HAVE_XPM || defined HAVE_NS || defined HAVE_PGTK
 /* Value is true if COLOR_SYMBOLS is a valid color symbols list
    for XPM images.  Such a list must consist of conses whose car and
    cdr are strings.  */
@@ -4840,7 +4840,7 @@ xpm_load (struct frame *f, struct image *img)
 #endif /* HAVE_XPM && !USE_CAIRO */
 
 #if (defined USE_CAIRO && defined HAVE_XPM)	\
-  || (defined HAVE_NS && !defined HAVE_XPM)
+  || ((defined HAVE_NS || defined HAVE_PGTK) && !defined HAVE_XPM)
 
 /* XPM support functions for NS where libxpm is not available, and for
    Cairo.  Only XPM version 3 (without any extensions) is supported.  */