* 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 a83bfbb2f4690c8009414566d343f6a703322351..1ede517243fc5ededf5f4007dff143ce6a79bed1 100644 (file)
--- 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 d57aaee3e7d165dde11c61b5abd2e45466e047a6..438db97c6a58db4de6667d1696577c023a08bc02 100644 (file)
--- 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 f1c3d5d84f0401afc2e44cc44ab1144bba42a113..11c6aa8a17db09bb5389fa2bf1fc36437042caa7 100644 (file)
--- 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.  */