[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d02ce2c: Fix a enum conversion warning in macfont.m
From: |
Jan D. |
Subject: |
[Emacs-diffs] master d02ce2c: Fix a enum conversion warning in macfont.m |
Date: |
Fri, 15 May 2015 14:50:26 +0000 |
branch: master
commit d02ce2c4321d7b99abc2de21e01f9504008ec735
Author: Jan Djärv <address@hidden>
Commit: Jan Djärv <address@hidden>
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 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/macfont.h b/src/macfont.h
index f311577..403be94 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 \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master d02ce2c: Fix a enum conversion warning in macfont.m,
Jan D. <=