From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 4 May 2011 20:03:07 +0000 (+0200)
Subject: Fix previous change: the library cache is defined in w32.c.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~118
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=84d358f0d559acc398b019660c4a1a3a50fd6bb2;p=emacs.git

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 9e1705339de..9ec8931822d 100644
--- 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 2377b41735d..d78b556d8c9 100644
--- 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))