diff options
| author | Mattias Engdegård <mattiase@acm.org> | 2019-07-09 18:18:44 +0200 |
|---|---|---|
| committer | Mattias Engdegård <mattiase@acm.org> | 2019-07-09 18:40:57 +0200 |
| commit | a9d6ba49d5cc11fd921c796d2e4ad2d47121d34f (patch) | |
| tree | 30ed729458016dbb9e133289f2de936eba3d0d61 /src/xfont.c | |
| parent | 1ffa65cea5a967cbf5e2c1b80ccb7cacb758e7a8 (diff) | |
| download | emacs-a9d6ba49d5cc11fd921c796d2e4ad2d47121d34f.tar.gz emacs-a9d6ba49d5cc11fd921c796d2e4ad2d47121d34f.tar.bz2 emacs-a9d6ba49d5cc11fd921c796d2e4ad2d47121d34f.zip | |
Rename font_driver member close -> close_font
* src/alloc.c (cleanup_vector):
* src/xftfont.c (xftfont_driver):
* src/xfont.c (xfont_driver):
* src/nsfont.m (nsfont_driver):
* src/macfont.m (macfont_driver):
* src/ftxfont.c (ftxfont_driver):
* src/ftfont.c (ftfont_driver):
* src/ftcrfont.c (ftcrfont_driver):
* src/font.h (struct font_driver):
* src/font.c (font_clear_cache, font_close_object):
Rename `close' member to `close_font', to avoid clash with preprocessor
define of `close' in nt/inc/ms-w32.h and for consistency with `open_font'.
Diffstat (limited to 'src/xfont.c')
| -rw-r--r-- | src/xfont.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xfont.c b/src/xfont.c index f6cd2eda5f5..e7a0cb2277d 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -1107,7 +1107,7 @@ struct font_driver const xfont_driver = .match = xfont_match, .list_family = xfont_list_family, .open_font = xfont_open, - .close = xfont_close, + .close_font = xfont_close, .prepare_face = xfont_prepare_face, .has_char = xfont_has_char, .encode_char = xfont_encode_char, |