emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 35238c4fc0: Pacify -Wunused-macros in --without-all builds


From: Stefan Kangas
Subject: master 35238c4fc0: Pacify -Wunused-macros in --without-all builds
Date: Thu, 14 Jul 2022 08:05:12 -0400 (EDT)

branch: master
commit 35238c4fc020baccc1de24b38fe7b69e97e22c69
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Pacify -Wunused-macros in --without-all builds
    
    * src/image.c (IMAGE_TYPE_INIT): Make conditional on image support.
---
 src/image.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/image.c b/src/image.c
index aa7bb3ba66..cc6f27612b 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1071,9 +1071,16 @@ struct image_type
      libraries on Windows), or NULL if none.  */
   bool (*init) (void);
   /* An initializer for the init field.  */
-# define IMAGE_TYPE_INIT(f) f
-#else
-# define IMAGE_TYPE_INIT(f)
+#endif
+#if defined HAVE_RSVG || defined HAVE_PNG || defined HAVE_GIF || \
+  defined HAVE_TIFF || defined HAVE_JPEG || defined HAVE_XPM || \
+  defined HAVE_NS || defined HAVE_HAIKU || defined HAVE_PGTK || \
+  defined HAVE_WEBP
+# ifdef WINDOWSNT
+#  define IMAGE_TYPE_INIT(f) f
+# else
+#  define IMAGE_TYPE_INIT(f)
+# endif
 #endif
 };
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]