aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
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 8bac6573c23..35b5153649a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-05-11 Karel Klic <kklic@redhat.com>
2
3 * ftfont.c: Fix incorrect parentheses of #if condition for
4 definining M17N_FLT_USE_NEW_FEATURE.
5
12010-05-11 Glenn Morris <rgm@gnu.org> 62010-05-11 Glenn Morris <rgm@gnu.org>
2 7
3 * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. 8 * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
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. */