From ec723406476c818ab8f1da926e70668e36206289 Mon Sep 17 00:00:00 2001 From: Mattias Engdegård Date: Tue, 9 Jul 2019 16:44:24 +0200 Subject: 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. --- src/xfont.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/xfont.c') 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, -- cgit v1.2.3