From 637ac44c57e785fbf03134f85ece58e851eb7a6c Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 7 Jan 2008 02:08:28 +0000 Subject: [PATCH] (ftfont_driver): Set ftfont_shape in ftfont_driver only when both HAVE_M17N_FLT and HAVE_LIBOTF are defined. --- src/ftfont.c | 6 +++--- 1 file 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; -- 2.39.5