aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2018-06-15 09:06:13 -0700
committerPaul Eggert2018-06-15 09:08:59 -0700
commit850c0c1a8799f4e59b465b849fdbe6a57ec2ebfd (patch)
tree4e58195f9d7ac32209b14beb6cbbf63821ad8522
parent115decb07d99be74c114141a6745cfd3603c7aaf (diff)
downloademacs-850c0c1a8799f4e59b465b849fdbe6a57ec2ebfd.tar.gz
emacs-850c0c1a8799f4e59b465b849fdbe6a57ec2ebfd.zip
Restore macfont.m casts to void *
* src/macfont.m (macfont_set_family_cache): Restore casts to void * that were mistakenly removed in my recent change. The types in question are pointer-to-const. Problem reported by Clemens Schüller.
-rw-r--r--src/macfont.m4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/macfont.m b/src/macfont.m
index 8abe203644b..3a1e9e5f477 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -908,7 +908,7 @@ macfont_descriptor_entity (CTFontDescriptorRef desc, Lisp_Object extra,
908 ASET (entity, FONT_EXTRA_INDEX, Fcopy_sequence (extra)); 908 ASET (entity, FONT_EXTRA_INDEX, Fcopy_sequence (extra));
909 name = CTFontDescriptorCopyAttribute (desc, kCTFontNameAttribute); 909 name = CTFontDescriptorCopyAttribute (desc, kCTFontNameAttribute);
910 font_put_extra (entity, QCfont_entity, 910 font_put_extra (entity, QCfont_entity,
911 Fcons (make_mint_ptr (name), make_number (traits))); 911 Fcons (make_mint_ptr ((void *) name), make_number (traits)));
912 if (synth_sym_traits & kCTFontTraitItalic) 912 if (synth_sym_traits & kCTFontTraitItalic)
913 FONT_SET_STYLE (entity, FONT_SLANT_INDEX, 913 FONT_SET_STYLE (entity, FONT_SLANT_INDEX,
914 make_number (FONT_SLANT_SYNTHETIC_ITALIC)); 914 make_number (FONT_SLANT_SYNTHETIC_ITALIC));
@@ -984,7 +984,7 @@ macfont_set_family_cache (Lisp_Object symbol, CFStringRef string)
984 984
985 h = XHASH_TABLE (macfont_family_cache); 985 h = XHASH_TABLE (macfont_family_cache);
986 i = hash_lookup (h, symbol, &hash); 986 i = hash_lookup (h, symbol, &hash);
987 value = string ? make_mint_ptr (CFRetain (string)) : Qnil; 987 value = string ? make_mint_ptr ((void *) CFRetain (string)) : Qnil;
988 if (i >= 0) 988 if (i >= 0)
989 { 989 {
990 Lisp_Object old_value = HASH_VALUE (h, i); 990 Lisp_Object old_value = HASH_VALUE (h, i);