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

Fix previous change: the library cache is defined in w32.c.

Browse source 
* image.c (CACHE_IMAGE_TYPE) [!HAVE_NTGUI]: Define to noop.
  (Finit_image_library): Wrap Vlibrary_cache on "#ifdef HAVE_NTGUI".
This commit is contained in:
Juanma Barranquero 2011-05-04 22:03:07 +02:00
parent 9ed7c8cbce
commit 84d358f0d5
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2011-05-04 Juanma Barranquero <lekktu@gmail.com>
Fix previous change: the library cache is defined in w32.c.
* image.c (CACHE_IMAGE_TYPE) [!HAVE_NTGUI]: Define to noop.
(Finit_image_library): Wrap Vlibrary_cache on "#ifdef HAVE_NTGUI".
2011-05-04 Juanma Barranquero <lekktu@gmail.com>
Implement dynamic loading of GnuTLS on Windows.

7
src/image.c
View file

@ -584,9 +584,12 @@ static void x_laplace (struct frame *, struct image *);
static void x_emboss (struct frame *, struct image *);
static int x_build_heuristic_mask (struct frame *, struct image *,
Lisp_Object);
#ifdef HAVE_NTGUI
#define CACHE_IMAGE_TYPE(type, status) \
do { Vlibrary_cache = Fcons (Fcons (type, status), Vlibrary_cache); } while (0)
#else
#define CACHE_IMAGE_TYPE(type, status)
#endif
#define ADD_IMAGE_TYPE(type) \
do { Vimage_types = Fcons (type, Vimage_types); } while (0)
@ -8601,10 +8604,12 @@ of `dynamic-library-alist', which see). */)
{
Lisp_Object tested;
#ifdef HAVE_NTGUI
/* Don't try to reload the library. */
tested = Fassq (type, Vlibrary_cache);
if (CONSP (tested))
return XCDR (tested);
#endif
#if defined (HAVE_XPM) || defined (HAVE_NS)
if (EQ (type, Qxpm))