summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-12 11:18:23 +0000
committerEgbert Eich <eich@suse.de>2004-03-12 11:18:23 +0000
commitb752403a028a4ee317c4cb40d798adff3438f271 (patch)
tree4db22f0a4ff0761e5013f9467e9b94d9b8fb799e
parent348ed2ba79027c6d176266955ab3a376900d3c8d (diff)
34. Added a hack to fc-lang and fc-list to prevent installation if defineXPRINT_BASEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW
InstallFontconfigLibrary NO (Egbert Eich). 33. Updated Xft to 2.1.5 (Egbert Eich). 32. Make ELF loader work on systems with non-exec stack/heaps (bugzilla #296, John Dennis, Mike Harris). 31. Fix for xdm to work on a non-IPv6 system when built with IPv6 support (bugzilla #287, Peter Breitenlohner) (confirmed by: Alan Coopersmith). 30. Fix Xi XselectExtensionEvent for 64 bit machines (bugzilla #285, Andreas Luik) (confirmed by: Paul Anderson, Alan Coopersmith).
-rw-r--r--include/X11/Xft/Xft.h2
-rw-r--r--src/xftfreetype.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/include/X11/Xft/Xft.h b/include/X11/Xft/Xft.h
index 49c5720..d495b58 100644
--- a/include/X11/Xft/Xft.h
+++ b/include/X11/Xft/Xft.h
@@ -33,7 +33,7 @@
#define XFT_MAJOR 2
#define XFT_MINOR 1
-#define XFT_REVISION 4
+#define XFT_REVISION 5
#define XFT_VERSION ((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION))
#define XftVersion XFT_VERSION
diff --git a/src/xftfreetype.c b/src/xftfreetype.c
index 063f678..d6285b4 100644
--- a/src/xftfreetype.c
+++ b/src/xftfreetype.c
@@ -208,9 +208,6 @@ _XftSetFace (XftFtFile *f, FT_F26Dot6 xsize, FT_F26Dot6 ysize, FT_Matrix *matrix
#if !HAVE_FT_BITMAP_SIZE_Y_PPEM
#define y_ppem height
#define x_ppem width
-#warning using old freetype without y_ppem
-#else
-#warning using new freetype with y_ppem
#endif
for (i = 0; i < face->num_fixed_sizes; i++)
{