From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 15 Jun 2018 16:06:13 +0000 (-0700)
Subject: Restore macfont.m casts to void *
X-Git-Tag: emacs-27.0.90~4848
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=850c0c1a8799f4e59b465b849fdbe6a57ec2ebfd;p=emacs.git

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.
---

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);