From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 13 Apr 2011 23:44:57 +0000 (-0700)
Subject: * image.c: Make symbols static if they're not exported.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~323
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cd44d2ebb43eb738eca182841c903f8419cd6b5b;p=emacs.git

* image.c: Make symbols static if they're not exported.

* dispextern.h (x_create_bitmap_from_xpm_data): Do not declare
if USE_GTK.
* image.c (x_create_bitmap_from_xpm_data): Do not define if USE_GTK.
(xpm_color_cache, ct_table, ct_colors_allocated): Now static.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a83bfbb2f46..1ede517243f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2011-04-13  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* image.c: Make symbols static if they're not exported.
+	* dispextern.h (x_create_bitmap_from_xpm_data): Do not declare
+	if USE_GTK.
+	* image.c (x_create_bitmap_from_xpm_data): Do not define if USE_GTK.
+	(xpm_color_cache, ct_table, ct_colors_allocated): Now static.
+
 	* fringe.c (standard_bitmaps): Now static.
 	(max_used_fringe_bitmap): Now static, unless HAVE_NS.
 
diff --git a/src/dispextern.h b/src/dispextern.h
index d57aaee3e7d..438db97c6a5 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3082,7 +3082,7 @@ extern void x_reference_bitmap (struct frame *, int);
 extern int x_create_bitmap_from_data (struct frame *, char *,
                                       unsigned int, unsigned int);
 extern int x_create_bitmap_from_file (struct frame *, Lisp_Object);
-#if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)
+#if defined HAVE_XPM && defined HAVE_X_WINDOWS && !defined USE_GTK
 extern int x_create_bitmap_from_xpm_data (struct frame *f, const char **bits);
 #endif
 #ifndef x_destroy_bitmap
diff --git a/src/image.c b/src/image.c
index f1c3d5d84f0..11c6aa8a17d 100644
--- a/src/image.c
+++ b/src/image.c
@@ -3096,7 +3096,7 @@ struct xpm_cached_color
    size.  */
 
 #define XPM_COLOR_CACHE_BUCKETS	1001
-struct xpm_cached_color **xpm_color_cache;
+static struct xpm_cached_color **xpm_color_cache;
 
 /* Initialize the color cache.  */
 
@@ -3312,7 +3312,7 @@ xpm_image_p (Lisp_Object object)
 
 #endif /* HAVE_XPM || HAVE_NS */
 
-#if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)
+#if defined HAVE_XPM && defined HAVE_X_WINDOWS && !defined USE_GTK
 int
 x_create_bitmap_from_xpm_data (struct frame *f, const char **bits)
 {
@@ -4136,11 +4136,11 @@ struct ct_color
 
 /* The color hash table.  */
 
-struct ct_color **ct_table;
+static struct ct_color **ct_table;
 
 /* Number of entries in the color table.  */
 
-int ct_colors_allocated;
+static int ct_colors_allocated;
 
 /* Initialize the color table.  */