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".

diff --git a/src/ChangeLog b/src/ChangeLog
index 9e1705339de4d31e6a61b40d676b3fd549f0ff4b..9ec8931822dcb793777131127ed054956bbba003 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/src/image.c b/src/image.c
index 2377b41735db6da3079cd01fa9a54dd97f1b5abf..d78b556d8c9954dafde7f7a5f4a9ea41ba8c993e 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -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))