Commit cd44d2eb authored by Paul Eggert's avatar Paul Eggert
Browse files

* 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.
parent ad9a7a06
2011-04-13 Paul Eggert <eggert@cs.ucla.edu> 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. * fringe.c (standard_bitmaps): Now static.
(max_used_fringe_bitmap): Now static, unless HAVE_NS. (max_used_fringe_bitmap): Now static, unless HAVE_NS.
......
...@@ -3082,7 +3082,7 @@ extern void x_reference_bitmap (struct frame *, int); ...@@ -3082,7 +3082,7 @@ extern void x_reference_bitmap (struct frame *, int);
extern int x_create_bitmap_from_data (struct frame *, char *, extern int x_create_bitmap_from_data (struct frame *, char *,
unsigned int, unsigned int); unsigned int, unsigned int);
extern int x_create_bitmap_from_file (struct frame *, Lisp_Object); 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); extern int x_create_bitmap_from_xpm_data (struct frame *f, const char **bits);
#endif #endif
#ifndef x_destroy_bitmap #ifndef x_destroy_bitmap
......
...@@ -3096,7 +3096,7 @@ struct xpm_cached_color ...@@ -3096,7 +3096,7 @@ struct xpm_cached_color
size. */ size. */
#define XPM_COLOR_CACHE_BUCKETS 1001 #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. */ /* Initialize the color cache. */
...@@ -3312,7 +3312,7 @@ xpm_image_p (Lisp_Object object) ...@@ -3312,7 +3312,7 @@ xpm_image_p (Lisp_Object object)
#endif /* HAVE_XPM || HAVE_NS */ #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 int
x_create_bitmap_from_xpm_data (struct frame *f, const char **bits) x_create_bitmap_from_xpm_data (struct frame *f, const char **bits)
{ {
...@@ -4136,11 +4136,11 @@ struct ct_color ...@@ -4136,11 +4136,11 @@ struct ct_color
/* The color hash table. */ /* The color hash table. */
struct ct_color **ct_table; static struct ct_color **ct_table;
/* Number of entries in the color table. */ /* Number of entries in the color table. */
int ct_colors_allocated; static int ct_colors_allocated;
/* Initialize the color table. */ /* Initialize the color table. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment