* image.c (x_query_frame_background_color)

[HAVE_PNG || HAVE_NS || HAVE_IMAGEMAGICK || HAVE_RSVG]:
Fix --enable-gcc-warnings compilation without image libraries.

diff --git a/src/ChangeLog b/src/ChangeLog
index c22b925a1d7fc4c30d692a75d0699dd5b26e64bc..1f321a9df4b86b42d7d623ac134a84be8a1cd1be 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-02  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * image.c (x_query_frame_background_color)
+       [HAVE_PNG || HAVE_NS || HAVE_IMAGEMAGICK || HAVE_RSVG]:
+       Fix --enable-gcc-warnings compilation without image libraries.
+
 2014-06-02  Eli Zaretskii  <eliz@gnu.org>
 
        * w32heap.c (malloc_after_dump, realloc_after_dump): Update the

diff --git a/src/image.c b/src/image.c
index 304603e7382d8ebf70d6ebde135ff120aa0b1512..3220a45a282ba6979a19c684290818ce0a8cd940 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -1236,6 +1236,9 @@ image_background_transparent (struct image *img, struct frame *f, XImagePtr_or_D
   return img->background_transparent;
 }
 
+#if defined (HAVE_PNG) || defined (HAVE_NS) \
+  || defined (HAVE_IMAGEMAGICK) || defined (HAVE_RSVG)
+
 /* Store F's background color into *BGCOLOR.  */
 static void
 x_query_frame_background_color (struct frame *f, XColor *bgcolor)
@@ -1248,7 +1251,8 @@ x_query_frame_background_color (struct frame *f, XColor *bgcolor)
 #endif
 }
 
-\f
+#endif /* HAVE_PNG || HAVE_NS || HAVE_IMAGEMAGICK || HAVE_RSVG */
+
 /***********************************************************************
                  Helper functions for X image types
  ***********************************************************************/