aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2020-04-14 18:19:59 +0300
committerEli Zaretskii2020-04-14 18:19:59 +0300
commit6bf79d65d35d558831e6e8279fa38320c5ffab87 (patch)
tree7b9fd87fe8d802acb6b4903ad663e823ae8c6c9b /src
parente94206aaf608a899c81bb07fe91d26439f51b3f8 (diff)
downloademacs-6bf79d65d35d558831e6e8279fa38320c5ffab87.tar.gz
emacs-6bf79d65d35d558831e6e8279fa38320c5ffab87.zip
; * src/image.c: Cleanup of #ifdef's related to HAVE_NATIVE_IMAGE_API.
Diffstat (limited to 'src')
-rw-r--r--src/image.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/image.c b/src/image.c
index 4ef3e9d3e4c..aacaf0b7345 100644
--- a/src/image.c
+++ b/src/image.c
@@ -10224,10 +10224,8 @@ initialize_image_type (struct image_type const *type)
10224#ifdef WINDOWSNT 10224#ifdef WINDOWSNT
10225 Lisp_Object typesym = builtin_lisp_symbol (type->type); 10225 Lisp_Object typesym = builtin_lisp_symbol (type->type);
10226 10226
10227#ifdef HAVE_NATIVE_IMAGE_API
10228 if (image_can_use_native_api (typesym)) 10227 if (image_can_use_native_api (typesym))
10229 return true; 10228 return true;
10230#endif
10231 10229
10232 Lisp_Object tested = Fassq (typesym, Vlibrary_cache); 10230 Lisp_Object tested = Fassq (typesym, Vlibrary_cache);
10233 /* If we failed to load the library before, don't try again. */ 10231 /* If we failed to load the library before, don't try again. */
@@ -10285,7 +10283,7 @@ static struct image_type const image_types[] =
10285 { SYMBOL_INDEX (Qpbm), pbm_image_p, pbm_load, image_clear_image }, 10283 { SYMBOL_INDEX (Qpbm), pbm_image_p, pbm_load, image_clear_image },
10286}; 10284};
10287 10285
10288#ifdef HAVE_NATIVE_IMAGE_API 10286#if HAVE_NATIVE_IMAGE_API
10289struct image_type native_image_type = 10287struct image_type native_image_type =
10290 { SYMBOL_INDEX (Qnative_image), native_image_p, native_image_load, 10288 { SYMBOL_INDEX (Qnative_image), native_image_p, native_image_load,
10291 image_clear_image }; 10289 image_clear_image };
@@ -10297,7 +10295,7 @@ struct image_type native_image_type =
10297static struct image_type const * 10295static struct image_type const *
10298lookup_image_type (Lisp_Object type) 10296lookup_image_type (Lisp_Object type)
10299{ 10297{
10300#ifdef HAVE_NATIVE_IMAGE_API 10298#if HAVE_NATIVE_IMAGE_API
10301 if (image_can_use_native_api (type)) 10299 if (image_can_use_native_api (type))
10302 return &native_image_type; 10300 return &native_image_type;
10303#endif 10301#endif