comparison src/font-mgr.h @ 5125:b5df3737028a ben-lisp-object

merge
author Ben Wing <ben@xemacs.org>
date Wed, 24 Feb 2010 01:58:04 -0600
parents d1247f3cc363 a6c778975d7d
children a9c41067dd88
comparison
equal deleted inserted replaced
5124:623d57b7fbe8 5125:b5df3737028a
87 #define CONCHECK_FCCONFIG(x) CONCHECK_RECORD (x, fc_config) 87 #define CONCHECK_FCCONFIG(x) CONCHECK_RECORD (x, fc_config)
88 #define XFCCONFIG_PTR(x) (XFCCONFIG(x)->fccfgPtr) 88 #define XFCCONFIG_PTR(x) (XFCCONFIG(x)->fccfgPtr)
89 89
90 #endif /* FONTCONFIG_EXPOSE_CONFIG */ 90 #endif /* FONTCONFIG_EXPOSE_CONFIG */
91 91
92 #ifdef USE_XFT 92 #ifdef HAVE_XFT
93 93
94 #ifndef HAVE_FCCONFIGGETRESCANINTERVAL 94 #ifndef HAVE_FCCONFIGGETRESCANINTERVAL
95 /* Older fontconfig versions misspell this function name. */ 95 /* Older fontconfig versions misspell this function name. */
96 #define FcConfigGetRescanInterval FcConfigGetRescanInverval 96 #define FcConfigGetRescanInterval FcConfigGetRescanInverval
97 #endif /* */ 97 #endif /* */
162 #define CHECKING_LANG(level,font,lang) \ 162 #define CHECKING_LANG(level,font,lang) \
163 do { \ 163 do { \
164 DEBUG_XFT2 (level, "checking if %s handles %s\n", font, lang); \ 164 DEBUG_XFT2 (level, "checking if %s handles %s\n", font, lang); \
165 } while (0) 165 } while (0)
166 166
167 #else /* USE_XFT */ 167 #else /* HAVE_XFT */
168 168
169 #endif /* USE_XFT */ 169 #endif /* HAVE_XFT */
170 170
171 #endif /* INCLUDED_font_mgr_h_ */ 171 #endif /* INCLUDED_font_mgr_h_ */