From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 14 Apr 2020 19:22:07 +0000 (+0300)
Subject: Avoid compiler warning in image.c
X-Git-Tag: emacs-28.0.90~7583
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=26df9aae532827461047159836569406c707c211;p=emacs.git

Avoid compiler warning in image.c

* src/image.c (image_can_use_native_api): Avoid compiler warnings
by making this function conditioned on HAVE_NATIVE_IMAGE_API.
(initialize_image_type): Call image_can_use_native_api only if
HAVE_NATIVE_IMAGE_API is non-zero.  Reported by Basil
L. Contovounesios <contovob@tcd.ie>.
---

diff --git a/src/image.c b/src/image.c
index aacaf0b7345..acb1e9d23d8 100644
--- a/src/image.c
+++ b/src/image.c
@@ -6236,22 +6236,17 @@ pbm_load (struct frame *f, struct image *img)
 			    NATIVE IMAGE HANDLING
  ***********************************************************************/
 
+#if HAVE_NATIVE_IMAGE_API
 static bool
 image_can_use_native_api (Lisp_Object type)
 {
-#if HAVE_NATIVE_IMAGE_API
 # ifdef HAVE_NTGUI
   return w32_can_use_native_image_api (type);
 # else
   return false;
 # endif
-#else
-  return false;
-#endif
 }
 
-#if HAVE_NATIVE_IMAGE_API
-
 /*
  * These functions are actually defined in the OS-native implementation
  * file.  Currently, for Windows GDI+ interface, w32image.c, but other
@@ -10224,8 +10219,10 @@ initialize_image_type (struct image_type const *type)
 #ifdef WINDOWSNT
   Lisp_Object typesym = builtin_lisp_symbol (type->type);
 
+# if HAVE_NATIVE_IMAGE_API
   if (image_can_use_native_api (typesym))
     return true;
+# endif
 
   Lisp_Object tested = Fassq (typesym, Vlibrary_cache);
   /* If we failed to load the library before, don't try again.  */