diff options
| author | Kenichi Handa <handa@m17n.org> | 2008-01-07 02:08:28 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2008-01-07 02:08:28 +0000 |
| commit | 637ac44c57e785fbf03134f85ece58e851eb7a6c (patch) | |
| tree | 5b12fa53f5d6612158c8927822858ad2e57debde /src/ftfont.c | |
| parent | e8912e41f82c859e38a6d52443d8667974377bee (diff) | |
| download | emacs-637ac44c57e785fbf03134f85ece58e851eb7a6c.tar.gz | |
(ftfont_driver): Set ftfont_shape in ftfont_driver only
when both HAVE_M17N_FLT and HAVE_LIBOTF are defined.
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 316f8f3cf09..7c8ade894f8 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -306,11 +306,11 @@ struct font_driver ftfont_driver = 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; |