From 850c0c1a8799f4e59b465b849fdbe6a57ec2ebfd Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 15 Jun 2018 09:06:13 -0700 Subject: [PATCH] Restore macfont.m casts to void * MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * 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. --- src/macfont.m | 4 ++-- 1 file 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, ASET (entity, FONT_EXTRA_INDEX, Fcopy_sequence (extra)); name = CTFontDescriptorCopyAttribute (desc, kCTFontNameAttribute); font_put_extra (entity, QCfont_entity, - Fcons (make_mint_ptr (name), make_number (traits))); + Fcons (make_mint_ptr ((void *) name), make_number (traits))); if (synth_sym_traits & kCTFontTraitItalic) FONT_SET_STYLE (entity, FONT_SLANT_INDEX, make_number (FONT_SLANT_SYNTHETIC_ITALIC)); @@ -984,7 +984,7 @@ macfont_set_family_cache (Lisp_Object symbol, CFStringRef string) h = XHASH_TABLE (macfont_family_cache); i = hash_lookup (h, symbol, &hash); - value = string ? make_mint_ptr (CFRetain (string)) : Qnil; + value = string ? make_mint_ptr ((void *) CFRetain (string)) : Qnil; if (i >= 0) { Lisp_Object old_value = HASH_VALUE (h, i); -- 2.39.2