Mercurial > hg > xemacs-beta

comparison src/console-x.h @ 4969:cbe181529c34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge
author Ben Wing <ben@xemacs.org>
date Wed, 03 Feb 2010 21:46:21 -0600
parents e813cf16c015 a6c778975d7d
children 2ade80e8c640
comparison
equal deleted inserted replaced
4968:4d35e52790f8 4969:cbe181529c34
49 49
50 #ifdef HAVE_XPM 50 #ifdef HAVE_XPM
51 #include <X11/xpm.h> 51 #include <X11/xpm.h>
52 #endif 52 #endif
53 53
54 #ifdef USE_XFT 54 #ifdef HAVE_XFT
55 /* shut up GCC */ 55 /* shut up GCC */
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