# HG changeset patch # User Kenichi Handa # Date 1199671708 0 # Node ID 9b6270bcd1a758f184c432809fe61ecdaf1529f2 # Parent 0afaa00ae397f58f4414775efa757a7c5582ebaa (ftfont_driver): Set ftfont_shape in ftfont_driver only when both HAVE_M17N_FLT and HAVE_LIBOTF are defined. diff -r 0afaa00ae397 -r 9b6270bcd1a7 src/ftfont.c --- 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;