[Emacs-diffs] /srv/bzr/emacs/trunk r104108: Fix previous change: the library cache is defined in w32.c.

[Juanma Barranquero]

------------------------------------------------------------
revno: 104108
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2011-05-04 22:03:07 +0200
message:
  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".
modified:
  src/ChangeLog
  src/image.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-05-04 14:03:16 +0000
+++ b/src/ChangeLog     2011-05-04 20:03:07 +0000
@@ -1,5 +1,11 @@
 2011-05-04  Juanma Barranquero  <address@hidden>
 
+       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  <address@hidden>
+
        Implement dynamic loading of GnuTLS on Windows.
 
        * gnutls.h (GNUTLS_EMACS_ERROR_NOT_LOADED): New macro.

=== modified file 'src/image.c'
--- a/src/image.c       2011-05-04 14:03:16 +0000
+++ b/src/image.c       2011-05-04 20:03:07 +0000
@@ -584,9 +584,12 @@
 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 @@
 {
   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))