Mercurial > hg > xemacs-beta
comparison src/console-x.h @ 3354:15fb91e3a115
[xemacs-hg @ 2006-04-23 16:11:16 by stephent]
Xft/fontconfig refactoring, Part I. <87hd4ks29d.fsf@tleepslib.sk.tsukuba.ac.jp>
author | stephent |
---|---|
date | Sun, 23 Apr 2006 16:11:34 +0000 |
parents | ad2f4ae9895b |
children | 383ab474a241 |
comparison
equal
deleted
inserted
replaced
3353:521d94807505 | 3354:15fb91e3a115 |
---|---|
56 #define face_index face_index_arg | 56 #define face_index face_index_arg |
57 #define glyph_index glyph_index_arg | 57 #define glyph_index glyph_index_arg |
58 #include <X11/Xft/Xft.h> | 58 #include <X11/Xft/Xft.h> |
59 #undef glyph_index | 59 #undef glyph_index |
60 #undef face_index | 60 #undef face_index |
61 /* #### this should be made gone */ | |
62 #ifndef XFT_VERSION | |
63 #define XFT_VERSION 1 | |
64 #endif | |
65 #endif | 61 #endif |
66 | 62 |
67 /* R5 defines the XPointer type, but R4 doesn't. | 63 /* R5 defines the XPointer type, but R4 doesn't. |
68 R4 also doesn't define a version number, but R5 does. */ | 64 R4 also doesn't define a version number, but R5 does. */ |
69 #if (XlibSpecificationRelease < 5) | 65 #if (XlibSpecificationRelease < 5) |