diff options
| author | Jan Djärv | 2015-05-15 16:50:01 +0200 |
|---|---|---|
| committer | Jan Djärv | 2015-05-15 16:50:01 +0200 |
| commit | d02ce2c4321d7b99abc2de21e01f9504008ec735 (patch) | |
| tree | 5089d71a735aa3c059fcf184288276f5e2cf2a76 /src/macfont.h | |
| parent | b7b0d6e25376b98404197bf0539b795d541d29f9 (diff) | |
| download | emacs-d02ce2c4321d7b99abc2de21e01f9504008ec735.tar.gz emacs-d02ce2c4321d7b99abc2de21e01f9504008ec735.zip | |
Fix a enum conversion warning in macfont.m
* src/macfont.h (CharacterCollection): Typedef to NSCharacterCollection.
(MAC_CHARACTER_COLLECTION_*): Use the NS variants.
Diffstat (limited to 'src/macfont.h')
| -rw-r--r-- | src/macfont.h | 6 |
1 files 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 | |||
| 48 | typedef CTFontDescriptorRef FontDescriptorRef; | 48 | typedef CTFontDescriptorRef FontDescriptorRef; |
| 49 | typedef CTFontRef FontRef; | 49 | typedef CTFontRef FontRef; |
| 50 | typedef CTFontSymbolicTraits FontSymbolicTraits; | 50 | typedef CTFontSymbolicTraits FontSymbolicTraits; |
| 51 | typedef CTCharacterCollection CharacterCollection; | 51 | typedef NSCharacterCollection CharacterCollection; |
| 52 | 52 | ||
| 53 | #define MAC_FONT_NAME_ATTRIBUTE kCTFontNameAttribute | 53 | #define MAC_FONT_NAME_ATTRIBUTE kCTFontNameAttribute |
| 54 | #define MAC_FONT_FAMILY_NAME_ATTRIBUTE kCTFontFamilyNameAttribute | 54 | #define MAC_FONT_FAMILY_NAME_ATTRIBUTE kCTFontFamilyNameAttribute |
| @@ -79,8 +79,8 @@ enum { | |||
| 79 | }; | 79 | }; |
| 80 | 80 | ||
| 81 | enum { | 81 | enum { |
| 82 | MAC_CHARACTER_COLLECTION_IDENTITY_MAPPING = kCTIdentityMappingCharacterCollection, | 82 | MAC_CHARACTER_COLLECTION_IDENTITY_MAPPING = NSIdentityMappingCharacterCollection, |
| 83 | MAC_CHARACTER_COLLECTION_ADOBE_JAPAN1 = kCTAdobeJapan1CharacterCollection | 83 | MAC_CHARACTER_COLLECTION_ADOBE_JAPAN1 = NSAdobeJapan1CharacterCollection |
| 84 | }; | 84 | }; |
| 85 | 85 | ||
| 86 | #define mac_font_descriptor_create_with_attributes \ | 86 | #define mac_font_descriptor_create_with_attributes \ |