aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuuki Harano2021-05-19 23:06:56 +0900
committerYuuki Harano2021-05-19 23:06:56 +0900
commit82b4ea2fe820e3e49fb500cb220df60186f298c6 (patch)
treed951d240968dfae74c2644f2e0e058408671b37f
parente48372f8e5722643e37185b004469acd174663f7 (diff)
downloademacs-82b4ea2fe820e3e49fb500cb220df60186f298c6.tar.gz
emacs-82b4ea2fe820e3e49fb500cb220df60186f298c6.zip
* src/image.c: Fix compile error related xpm in image.c
Use the same code as NS.
-rw-r--r--src/image.c6
1 files changed, 3 insertions, 3 deletions
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
4191 XPM_LAST 4191 XPM_LAST
4192}; 4192};
4193 4193
4194#if defined HAVE_XPM || defined HAVE_NS 4194#if defined HAVE_XPM || defined HAVE_NS || defined HAVE_PGTK
4195/* Vector of image_keyword structures describing the format 4195/* Vector of image_keyword structures describing the format
4196 of valid XPM image specifications. */ 4196 of valid XPM image specifications. */
4197 4197
@@ -4433,7 +4433,7 @@ init_xpm_functions (void)
4433 4433
4434#endif /* WINDOWSNT */ 4434#endif /* WINDOWSNT */
4435 4435
4436#if defined HAVE_XPM || defined HAVE_NS 4436#if defined HAVE_XPM || defined HAVE_NS || defined HAVE_PGTK
4437/* Value is true if COLOR_SYMBOLS is a valid color symbols list 4437/* Value is true if COLOR_SYMBOLS is a valid color symbols list
4438 for XPM images. Such a list must consist of conses whose car and 4438 for XPM images. Such a list must consist of conses whose car and
4439 cdr are strings. */ 4439 cdr are strings. */
@@ -4840,7 +4840,7 @@ xpm_load (struct frame *f, struct image *img)
4840#endif /* HAVE_XPM && !USE_CAIRO */ 4840#endif /* HAVE_XPM && !USE_CAIRO */
4841 4841
4842#if (defined USE_CAIRO && defined HAVE_XPM) \ 4842#if (defined USE_CAIRO && defined HAVE_XPM) \
4843 || (defined HAVE_NS && !defined HAVE_XPM) 4843 || ((defined HAVE_NS || defined HAVE_PGTK) && !defined HAVE_XPM)
4844 4844
4845/* XPM support functions for NS where libxpm is not available, and for 4845/* XPM support functions for NS where libxpm is not available, and for
4846 Cairo. Only XPM version 3 (without any extensions) is supported. */ 4846 Cairo. Only XPM version 3 (without any extensions) is supported. */