Suppress address randomization on Darwin. Do not merge into trunk.

[gnu-emacs] / src / ftfont.c

diff --git a/src/ftfont.c b/src/ftfont.c
index e90a2fc5657ea4a287f4359adf39818a0f6f1c5e..6a7c09407b4cb1150af13ef19f13525d50804b27 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -162,7 +162,7 @@ extern Lisp_Object Qc, Qm, Qp, Qd;
 static Lisp_Object
 get_adstyle_property (FcPattern *p)
 {
-  char *str, *end;
+  unsigned char *str, *end;
   Lisp_Object adstyle;
 
   if (FcPatternGetString (p, FC_STYLE, 0, (FcChar8 **) &str) != FcResultMatch)
@@ -193,7 +193,7 @@ ftfont_pattern_entity (p, extra)
      Lisp_Object extra;
 {
   Lisp_Object key, cache, entity;
-  char *file, *str;
+  unsigned char *file, *str;
   int index;
   int numeric;
   double dbl;
@@ -1262,7 +1262,11 @@ ftfont_open (f, entity, pixel_size)
     spacing = XINT (AREF (entity, FONT_SPACING_INDEX));
   else
     spacing = FC_PROPORTIONAL;
-  if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
+  if (spacing != FC_PROPORTIONAL
+#ifdef FC_DUAL
+      && spacing != FC_DUAL
+#endif /* FC_DUAL */
+      )
     font->min_width = font->average_width = font->space_width
       = (scalable ? ft_face->max_advance_width * size / upEM
         : ft_face->size->metrics.max_advance >> 6);