aboutsummaryrefslogtreecommitdiff
path: root/libXft/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-03-12 08:32:17 +0100
committermarha <marha@users.sourceforge.net>2012-03-12 08:32:17 +0100
commit285bce5f59c5466a6fd1e3af601daa7cce066ea4 (patch)
treee1a9205dd5acd2c0ef7dc8a20ec3fac3a3aecf7f /libXft/src
parentf7eb7329c8efe023b304d5e66b08d1a998973220 (diff)
parentb91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff)
downloadvcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.gz
vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.bz2
vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.zip
Merge remote-tracking branch 'origin/released'
Conflicts: libX11/src/OpenDis.c libX11/src/xcb_io.c xorg-server/xkeyboard-config/keymap/sun_vndr/all.in xorg-server/xkeyboard-config/semantics/default.in
Diffstat (limited to 'libXft/src')
-rw-r--r--libXft/src/xftglyphs.c4
-rw-r--r--libXft/src/xftint.h10
2 files changed, 0 insertions, 14 deletions
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);