aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2008-01-07 02:08:28 +0000
committerKenichi Handa2008-01-07 02:08:28 +0000
commit637ac44c57e785fbf03134f85ece58e851eb7a6c (patch)
tree5b12fa53f5d6612158c8927822858ad2e57debde /src
parente8912e41f82c859e38a6d52443d8667974377bee (diff)
downloademacs-637ac44c57e785fbf03134f85ece58e851eb7a6c.tar.gz
emacs-637ac44c57e785fbf03134f85ece58e851eb7a6c.zip
(ftfont_driver): Set ftfont_shape in ftfont_driver only
when both HAVE_M17N_FLT and HAVE_LIBOTF are defined.
Diffstat (limited to 'src')
-rw-r--r--src/ftfont.c6
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 =
306 NULL, 306 NULL,
307 NULL, 307 NULL,
308 NULL, 308 NULL,
309#ifdef HAVE_M17N_FLT 309#if defined (HAVE_M17N_FLT) && defined (HAVE_LIBOTF)
310 ftfont_shape 310 ftfont_shape
311#else /* not HAVE_M17N_FLT */ 311#else /* not (HAVE_M17N_FLT && HAVE_LIBOTF) */
312 NULL 312 NULL
313#endif /* not HAVE_M17N_FLT */ 313#endif /* not (HAVE_M17N_FLT && HAVE_LIBOTF) */
314 }; 314 };
315 315
316extern Lisp_Object QCname; 316extern Lisp_Object QCname;