diff options
| author | Kenichi Handa | 2010-05-14 13:15:58 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-05-14 13:15:58 +0900 |
| commit | ccd3ce49e08b4f0c0e1bcbb34e9055ca4002e21c (patch) | |
| tree | 0f53c077154c7cd5f05b339d91905dfd2391679d /src/ftfont.c | |
| parent | 82ebc97b11a369303345927c98e7bc69928c9117 (diff) | |
| parent | 508197067c434b0111bcb6ded742d424bb738ece (diff) | |
| download | emacs-ccd3ce49e08b4f0c0e1bcbb34e9055ca4002e21c.tar.gz emacs-ccd3ce49e08b4f0c0e1bcbb34e9055ca4002e21c.zip | |
merge trunk
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 6956c134a7c..9699dc58009 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -1578,8 +1578,8 @@ ftfont_otf_capability (font) | |||
| 1578 | 1578 | ||
| 1579 | #ifdef HAVE_M17N_FLT | 1579 | #ifdef HAVE_M17N_FLT |
| 1580 | 1580 | ||
| 1581 | #if ((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10) \ | 1581 | #if (((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10)) \ |
| 1582 | && (M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6)) | 1582 | && ((M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6))) |
| 1583 | /* We can use the new feature of libotf and m17n-flt to handle the | 1583 | /* We can use the new feature of libotf and m17n-flt to handle the |
| 1584 | character encoding scheme introduced in Unicode 5.1 and 5.2 for | 1584 | character encoding scheme introduced in Unicode 5.1 and 5.2 for |
| 1585 | some Agian scripts. */ | 1585 | some Agian scripts. */ |