Mercurial > emacs
diff src/ftfont.c @ 91308:9b6270bcd1a7
(ftfont_driver): Set ftfont_shape in ftfont_driver only
when both HAVE_M17N_FLT and HAVE_LIBOTF are defined.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Mon, 07 Jan 2008 02:08:28 +0000 |
parents | 299c64a7a9fb |
children | 21d9f8ca293c |
line wrap: on
line diff
--- a/src/ftfont.c Mon Jan 07 02:02:05 2008 +0000 +++ b/src/ftfont.c Mon Jan 07 02:08:28 2008 +0000 @@ -306,11 +306,11 @@ NULL, NULL, NULL, -#ifdef HAVE_M17N_FLT +#if defined (HAVE_M17N_FLT) && defined (HAVE_LIBOTF) ftfont_shape -#else /* not HAVE_M17N_FLT */ +#else /* not (HAVE_M17N_FLT && HAVE_LIBOTF) */ NULL -#endif /* not HAVE_M17N_FLT */ +#endif /* not (HAVE_M17N_FLT && HAVE_LIBOTF) */ }; extern Lisp_Object QCname;