procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid compiler warning in image.c

Browse source 
* 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>.
This commit is contained in:
Eli Zaretskii 2020-04-14 22:22:07 +03:00
parent 6bf79d65d3
commit 26df9aae53
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/image.c
View file

@ -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. */