Mercurial > hg > xemacs-beta

diff src/console-x.h @ 3094:ad2f4ae9895b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-11-26 11:45:47 by stephent] Xft merge. <87k6ev4p8q.fsf@tleepslib.sk.tsukuba.ac.jp>
author stephent
date Sat, 26 Nov 2005 11:46:25 +0000
parents bc9d41cf82df
children 15fb91e3a115
line wrap: on
line diff
--- a/src/console-x.h	Fri Nov 25 22:51:38 2005 +0000
+++ b/src/console-x.h	Sat Nov 26 11:46:25 2005 +0000
@@ -51,6 +51,19 @@
 #include <X11/xpm.h>
 #endif
 
+#ifdef USE_XFT
+/* shut up GCC */
+#define face_index face_index_arg
+#define glyph_index glyph_index_arg
+#include <X11/Xft/Xft.h>
+#undef glyph_index
+#undef face_index
+/* #### this should be made gone */
+#ifndef XFT_VERSION
+#define XFT_VERSION 1
+#endif
+#endif
+
 /* R5 defines the XPointer type, but R4 doesn't.
    R4 also doesn't define a version number, but R5 does. */
 #if (XlibSpecificationRelease < 5)