diff options
Diffstat (limited to 'src/font.c')
| -rw-r--r-- | src/font.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/font.c b/src/font.c index ffd50644930..5b10fb2a158 100644 --- a/src/font.c +++ b/src/font.c @@ -44,12 +44,6 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ #include TERM_HEADER #endif /* HAVE_WINDOW_SYSTEM */ -/* Avoid macro definition of `open' in generated lib/fcntl.h to mess up - use of it as a struct member. */ -#ifndef WINDOWSNT -#undef open -#endif - #define DEFAULT_ENCODING Qiso8859_1 /* Vector of Vfont_weight_table, Vfont_slant_table, and Vfont_width_table. */ @@ -2908,7 +2902,7 @@ font_open_entity (struct frame *f, Lisp_Object entity, int pixel_size) width and height. */ for (psize = pixel_size; ; psize++) { - font_object = driver_list->driver->open (f, entity, psize); + font_object = driver_list->driver->open_font (f, entity, psize); if (NILP (font_object)) return Qnil; font = XFONT_OBJECT (font_object); |