aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorMattias EngdegÄrd2019-07-09 18:18:44 +0200
committerMattias EngdegÄrd2019-07-09 18:40:57 +0200
commita9d6ba49d5cc11fd921c796d2e4ad2d47121d34f (patch)
tree30ed729458016dbb9e133289f2de936eba3d0d61 /src/alloc.c
parent1ffa65cea5a967cbf5e2c1b80ccb7cacb758e7a8 (diff)
downloademacs-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/alloc.c')
-rw-r--r--src/alloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 90817da5974..833176d4e90 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3019,7 +3019,7 @@ cleanup_vector (struct Lisp_Vector *vector)
3019 { 3019 {
3020 /* Attempt to catch subtle bugs like Bug#16140. */ 3020 /* Attempt to catch subtle bugs like Bug#16140. */
3021 eassert (valid_font_driver (drv)); 3021 eassert (valid_font_driver (drv));
3022 drv->close (font); 3022 drv->close_font (font);
3023 } 3023 }
3024 } 3024 }
3025 } 3025 }