From b91444584a64f4f7b3eaeee05ef36ac53691fb24 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 12 Mar 2012 07:18:46 +0100
Subject: xkeyboard-config fontconfig libX11 libXft libxcb mesa git update 12
 Mar 2012

---
 libXft/src/xftglyphs.c |  4 ----
 libXft/src/xftint.h    | 10 ----------
 2 files changed, 14 deletions(-)

(limited to 'libXft')

diff --git a/libXft/src/xftglyphs.c b/libXft/src/xftglyphs.c
index 4a3b9d606..2f3dc5a6b 100644
--- a/libXft/src/xftglyphs.c
+++ b/libXft/src/xftglyphs.c
@@ -24,9 +24,7 @@
 #include <freetype/ftoutln.h>
 #include <freetype/ftlcdfil.h>
 
-#if HAVE_FT_GLYPHSLOT_EMBOLDEN
 #include <freetype/ftsynth.h>
-#endif
 
 /*
  * Validate the memory info for a font
@@ -434,12 +432,10 @@ XftFontLoadGlyphs (Display	    *dpy,
 
 	glyphslot = face->glyph;
 
-#if HAVE_FT_GLYPHSLOT_EMBOLDEN
 	/*
 	 * Embolden if required
 	 */
 	if (font->info.embolden) FT_GlyphSlot_Embolden(glyphslot);
-#endif
 
 	/*
 	 * Compute glyph metrics from FreeType information
diff --git a/libXft/src/xftint.h b/libXft/src/xftint.h
index 5cb57aeab..165897767 100644
--- a/libXft/src/xftint.h
+++ b/libXft/src/xftint.h
@@ -68,16 +68,6 @@
 # define _X_EXPORT /**/
 #endif
 
-#ifndef HAVE_CONFIG_H
-# if (FREETYPE_MAJOR > 2 ||						    \
-      (FREETYPE_MAJOR == 2 && (FREETYPE_MINOR > 1 ||			    \
-			       (FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 5))))
-#  define HAVE_FT_BITMAP_SIZE_Y_PPEM 1
-# else
-#  define HAVE_FT_BITMAP_SIZE_Y_PPEM 0
-# endif
-#endif
-
 typedef struct _XftMatcher {
     char    *object;
     double  (*compare) (char *object, FcValue value1, FcValue value2);
-- 
cgit v1.2.3