aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2010-05-11 20:15:29 +0900
committerKenichi Handa2010-05-11 20:15:29 +0900
commitc90ca7b7662200bb3153f45e4d05ee8ac695dda6 (patch)
treeebb092fbc54352b01c1502f7d06a182eef21eac2 /src
parent8290c6b9e657060bbbfaf77d42c1b5abf87b229a (diff)
downloademacs-c90ca7b7662200bb3153f45e4d05ee8ac695dda6.tar.gz
emacs-c90ca7b7662200bb3153f45e4d05ee8ac695dda6.zip
ftfont.c: Fix incorrect parentheses of #if condition for definining M17N_FLT_USE_NEW_FEATURE.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/ftfont.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 34d52a4442c..19b7efb71d1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-05-11 Karel Klic <kklic@redhat.com> (tiny change)
2
3 * ftfont.c: Fix incorrect parentheses of #if condition for
4 definining M17N_FLT_USE_NEW_FEATURE.
5
12010-05-07 Chong Yidong <cyd@stupidchicken.com> 62010-05-07 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * Version 23.2 released. 8 * Version 23.2 released.
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. */