From d02ce2c4321d7b99abc2de21e01f9504008ec735 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Fri, 15 May 2015 16:50:01 +0200 Subject: [PATCH] Fix a enum conversion warning in macfont.m * src/macfont.h (CharacterCollection): Typedef to NSCharacterCollection. (MAC_CHARACTER_COLLECTION_*): Use the NS variants. --- src/macfont.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/macfont.h b/src/macfont.h index f311577f051..403be94e332 100644 --- a/src/macfont.h +++ b/src/macfont.h @@ -48,7 +48,7 @@ struct mac_glyph_layout typedef CTFontDescriptorRef FontDescriptorRef; typedef CTFontRef FontRef; typedef CTFontSymbolicTraits FontSymbolicTraits; -typedef CTCharacterCollection CharacterCollection; +typedef NSCharacterCollection CharacterCollection; #define MAC_FONT_NAME_ATTRIBUTE kCTFontNameAttribute #define MAC_FONT_FAMILY_NAME_ATTRIBUTE kCTFontFamilyNameAttribute @@ -79,8 +79,8 @@ enum { }; enum { - MAC_CHARACTER_COLLECTION_IDENTITY_MAPPING = kCTIdentityMappingCharacterCollection, - MAC_CHARACTER_COLLECTION_ADOBE_JAPAN1 = kCTAdobeJapan1CharacterCollection + MAC_CHARACTER_COLLECTION_IDENTITY_MAPPING = NSIdentityMappingCharacterCollection, + MAC_CHARACTER_COLLECTION_ADOBE_JAPAN1 = NSAdobeJapan1CharacterCollection }; #define mac_font_descriptor_create_with_attributes \ -- 2.39.5