From e6a2b4c2df96ed8780ff407481a18e3f4299c8ad Mon Sep 17 00:00:00 2001 From: Alan Third Date: Thu, 31 Aug 2017 20:42:35 +0100 Subject: [PATCH] Remove unneeded version checks (bug#28222) * src/macfont.h (CGContextSetFontSmoothingStyle): Remove version check. * src/macfont.m (macfont_draw): Remove version check, and test for existence of CGContextSetFontSmoothingStyle. --- src/macfont.h | 5 +---- src/macfont.m | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/macfont.h b/src/macfont.h index 3a66d2d005a..909336cdbad 100644 --- a/src/macfont.h +++ b/src/macfont.h @@ -83,9 +83,6 @@ extern void mac_register_font_driver (struct frame *f); extern void *macfont_get_nsctfont (struct font *font); extern void macfont_update_antialias_threshold (void); -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 -/* This is an undocumented function that is probably not available - pre-10.8. */ +/* This is an undocumented function. */ extern void CGContextSetFontSmoothingStyle(CGContextRef, int) __attribute__((weak_import)); -#endif diff --git a/src/macfont.m b/src/macfont.m index 33c28f7349a..59891353cd3 100644 --- a/src/macfont.m +++ b/src/macfont.m @@ -2888,14 +2888,11 @@ macfont_draw (struct glyph_string *s, int from, int to, int x, int y, if (no_antialias_p) CGContextSetShouldAntialias (context, false); -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 - if (!NILP (ns_use_thin_smoothing) - && CGContextSetFontSmoothingStyle != NULL) + if (!NILP (ns_use_thin_smoothing)) { CGContextSetShouldSmoothFonts(context, YES); CGContextSetFontSmoothingStyle(context, 16); } -#endif CGContextSetTextMatrix (context, atfm); CGContextSetTextPosition (context, text_position.x, text_position.y); -- 2.39.2