diff options
| author | Mattias Engdegård <mattiase@acm.org> | 2019-07-09 16:44:24 +0200 |
|---|---|---|
| committer | Mattias Engdegård <mattiase@acm.org> | 2019-07-09 17:34:44 +0200 |
| commit | ec723406476c818ab8f1da926e70668e36206289 (patch) | |
| tree | 0ef190b2ba7ec005b361bdc446018d081bb07d6b /src/xfont.c | |
| parent | 1a1b5f9802577a09317dd036ccefba4222702f4f (diff) | |
| download | emacs-ec723406476c818ab8f1da926e70668e36206289.tar.gz emacs-ec723406476c818ab8f1da926e70668e36206289.tar.bz2 emacs-ec723406476c818ab8f1da926e70668e36206289.zip | |
Rename font_driver member open -> open_font
* 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_open_entity):
Rename `open' member to `open_font', to avoid clash with preprocessor
define of `open' in lib/fcntl.h and nt/inc/ms-w32.h. Remove earlier
#undef hack.
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 9a8417b12d4..f6cd2eda5f5 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -1106,7 +1106,7 @@ struct font_driver const xfont_driver = .list = xfont_list, .match = xfont_match, .list_family = xfont_list_family, - .open = xfont_open, + .open_font = xfont_open, .close = xfont_close, .prepare_face = xfont_prepare_face, .has_char = xfont_has_char, |