mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 18:41:25 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
* 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.
This commit is contained in:
Paul Eggert 2011-04-13 16:44:57 -07:00
parent ad9a7a06d4
commit cd44d2ebb4
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -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.

2
src/dispextern.h
View file

@ -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

8
src/image.c
View file

@ -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. */