Mercurial > hg > xemacs-beta
diff src/font-mgr.h @ 4918:c914214b788d
Automatic merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 03 Feb 2010 02:56:21 -0600 |
parents | a6c778975d7d |
children | b5df3737028a |
line wrap: on
line diff
--- a/src/font-mgr.h Wed Feb 03 00:20:08 2010 +0000 +++ b/src/font-mgr.h Wed Feb 03 02:56:21 2010 -0600 @@ -89,7 +89,7 @@ #endif /* FONTCONFIG_EXPOSE_CONFIG */ -#ifdef USE_XFT +#ifdef HAVE_XFT #ifndef HAVE_FCCONFIGGETRESCANINTERVAL /* Older fontconfig versions misspell this function name. */ @@ -164,8 +164,8 @@ DEBUG_XFT2 (level, "checking if %s handles %s\n", font, lang); \ } while (0) -#else /* USE_XFT */ +#else /* HAVE_XFT */ -#endif /* USE_XFT */ +#endif /* HAVE_XFT */ #endif /* INCLUDED_font_mgr_h_ */