diff options
| author | Mattias EngdegÄrd | 2019-07-09 18:18:44 +0200 |
|---|---|---|
| committer | Mattias EngdegÄrd | 2019-07-09 18:40:57 +0200 |
| commit | a9d6ba49d5cc11fd921c796d2e4ad2d47121d34f (patch) | |
| tree | 30ed729458016dbb9e133289f2de936eba3d0d61 /src/font.h | |
| parent | 1ffa65cea5a967cbf5e2c1b80ccb7cacb758e7a8 (diff) | |
| download | emacs-a9d6ba49d5cc11fd921c796d2e4ad2d47121d34f.tar.gz 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/font.h')
| -rw-r--r-- | src/font.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/font.h b/src/font.h index e59fc1d1b25..9d4b2d81c6f 100644 --- a/src/font.h +++ b/src/font.h | |||
| @@ -627,7 +627,7 @@ struct font_driver | |||
| 627 | int pixel_size); | 627 | int pixel_size); |
| 628 | 628 | ||
| 629 | /* Close FONT. NOTE: this can be called by GC. */ | 629 | /* Close FONT. NOTE: this can be called by GC. */ |
| 630 | void (*close) (struct font *font); | 630 | void (*close_font) (struct font *font); |
| 631 | 631 | ||
| 632 | /* Prepare FACE for displaying characters by FONT on frame F by | 632 | /* Prepare FACE for displaying characters by FONT on frame F by |
| 633 | storing some data in FACE->extra. */ | 633 | storing some data in FACE->extra. */ |