1 files changed, 15 insertions, 5 deletions

diff --git a/src/macfont.m b/src/macfont.m
index b25640e0cb8..02dc46824e9 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -3521,15 +3521,25 @@ mac_ctfont_create_preferred_family_for_attributes (CFDictionaryRef attributes)
 static inline double
 mac_ctfont_get_advance_width_for_glyph (CTFontRef font, CGGlyph glyph)
 {
-  return CTFontGetAdvancesForGlyphs (font, kCTFontDefaultOrientation,
-                                     &glyph, NULL, 1);
+  return CTFontGetAdvancesForGlyphs (font,
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
+                                     kCTFontOrientationDefault,
+#else
+                                     kCTFontDefaultOrientation,
+#endif
+                                     &glyph, NULL, 1);
 }
 
 static inline CGRect
 mac_ctfont_get_bounding_rect_for_glyph (CTFontRef font, CGGlyph glyph)
 {
-  return CTFontGetBoundingRectsForGlyphs (font, kCTFontDefaultOrientation,
-                                          &glyph, NULL, 1);
+  return CTFontGetBoundingRectsForGlyphs (font,
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
+                                          kCTFontOrientationDefault,
+#else
+                                          kCTFontDefaultOrientation,
+#endif
+                                          &glyph, NULL, 1);
 }
 
 static CFArrayRef
@@ -3891,7 +3901,7 @@ mac_font_copy_default_descriptors_for_language (CFStringRef language)
 #endif
     {
       CTFontRef user_font =
-        CTFontCreateUIFontForLanguage (kCTFontUserFontType, 0, language);
+        CTFontCreateUIFontForLanguage (kCTFontUIFontUser, 0, language);
 
       if (user_font)
         {