diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-12 01:42:29 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-12 01:42:29 -0700 |
| commit | 1675728f009404df6bc79b7e0933bc675afa1be1 (patch) | |
| tree | fb59d49bf354757f72dd2ef06c53882a04fb8257 /src | |
| parent | e4cebfca13580f80fb0ecee27afb81b55c031535 (diff) | |
| download | emacs-1675728f009404df6bc79b7e0933bc675afa1be1.tar.gz | |
* ftxfont.c: Make symbols static if they're not exported.
(ftxfont_driver): Export only if !defined HAVE_XFT && def8ined
HAVE_FREETYPE.
* font.h (ftxfont_driver): Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/font.h | 5 | ||||
| -rw-r--r-- | src/ftxfont.c | 14 |
3 files changed, 16 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9b145d865db..1498d267775 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2011-04-12 Paul Eggert <eggert@cs.ucla.edu> + * ftxfont.c: Make symbols static if they're not exported. + (ftxfont_driver): Export only if !defined HAVE_XFT && def8ined + HAVE_FREETYPE. + * font.h (ftxfont_driver): Likewise. + * xfns.c: Make symbols static if they're not exported. (x_last_font_name, x_display_info_for_name): (x_set_foreground_color, x_set_background_color, x_set_mouse_color): diff --git a/src/font.h b/src/font.h index ead5223a6cb..efcd56b0365 100644 --- a/src/font.h +++ b/src/font.h @@ -821,13 +821,14 @@ extern void syms_of_ftfont (void); #endif /* HAVE_FREETYPE */ #ifdef HAVE_X_WINDOWS extern struct font_driver xfont_driver; -extern struct font_driver ftxfont_driver; extern void syms_of_xfont (void); extern void syms_of_ftxfont (void); #ifdef HAVE_XFT extern struct font_driver xftfont_driver; extern void syms_of_xftfont (void); -#endif /* HAVE_XFT */ +#elif defined HAVE_FREETYPE +extern struct font_driver ftxfont_driver; +#endif #ifdef HAVE_BDFFONT extern void syms_of_bdffont (void); #endif /* HAVE_BDFFONT */ diff --git a/src/ftxfont.c b/src/ftxfont.c index c6fa858af74..bbba3ca8163 100644 --- a/src/ftxfont.c +++ b/src/ftxfont.c @@ -38,6 +38,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ static Lisp_Object Qftx; +#if defined HAVE_XFT || !defined HAVE_FREETYPE +static +#endif +struct font_driver ftxfont_driver; + /* Prototypes for helper function. */ static GC *ftxfont_get_gcs (FRAME_PTR, unsigned long, unsigned long); static int ftxfont_draw_bitmap (FRAME_PTR, GC, GC *, struct font *, @@ -233,13 +238,11 @@ static Lisp_Object ftxfont_open (FRAME_PTR, Lisp_Object, int); static void ftxfont_close (FRAME_PTR, struct font *); static int ftxfont_draw (struct glyph_string *, int, int, int, int, int); -struct font_driver ftxfont_driver; - static Lisp_Object ftxfont_list (Lisp_Object frame, Lisp_Object spec) { Lisp_Object list = ftfont_driver.list (frame, spec), tail; - + for (tail = list; CONSP (tail); tail = XCDR (tail)) ASET (XCAR (tail), FONT_TYPE_INDEX, Qftx); return list; @@ -350,13 +353,13 @@ static int ftxfont_end_for_frame (FRAME_PTR f) { struct ftxfont_frame_data *data = font_get_frame_data (f, &ftxfont_driver); - + BLOCK_INPUT; while (data) { struct ftxfont_frame_data *next = data->next; int i; - + for (i = 0; i < 6; i++) XFreeGC (FRAME_X_DISPLAY (f), data->gcs[i]); free (data); @@ -384,4 +387,3 @@ syms_of_ftxfont (void) ftxfont_driver.end_for_frame = ftxfont_end_for_frame; register_font_driver (&ftxfont_driver, NULL); } - |