Mercurial > hg > xemacs-beta

comparison 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
comparison
equal deleted inserted replaced
3093:769dc945b085 3094:ad2f4ae9895b
47 #include <X11/Xatom.h> 47 #include <X11/Xatom.h>
48 #include <X11/StringDefs.h> 48 #include <X11/StringDefs.h>
49 49
50 #ifdef HAVE_XPM 50 #ifdef HAVE_XPM
51 #include <X11/xpm.h> 51 #include <X11/xpm.h>
52 #endif
53
54 #ifdef USE_XFT
55 /* shut up GCC */
56 #define face_index face_index_arg
57 #define glyph_index glyph_index_arg
58 #include <X11/Xft/Xft.h>
59 #undef glyph_index
60 #undef face_index
61 /* #### this should be made gone */
62 #ifndef XFT_VERSION
63 #define XFT_VERSION 1
64 #endif
52 #endif 65 #endif
53 66
54 /* R5 defines the XPointer type, but R4 doesn't. 67 /* R5 defines the XPointer type, but R4 doesn't.
55 R4 also doesn't define a version number, but R5 does. */ 68 R4 also doesn't define a version number, but R5 does. */
56 #if (XlibSpecificationRelease < 5) 69 #if (XlibSpecificationRelease < 5)