summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2012-01-16 20:41:53 +0900
committersuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2012-01-16 20:41:53 +0900
commit8a5cea2616e799ec0354d59d1141b29de387193d (patch)
tree4c9920b9cf3d9beeed0f8702907065bb52bc98a6
parent4880a0ed82c59f8be278bed74d6f8b3b9a454795 (diff)
downloadfreetype2-8a5cea2616e799ec0354d59d1141b29de387193d.tar.gz
[autofit] Fix the inclusion of "aflatin2.h" in PIC file.
* src/autofit/afpic.c: Include "aflatin2.h" when FT_OPTION_AUTOFIT2 is defined, as afglobal.c does so. Unconditionally inclusion causes declared but unimplemented warning by GCC 4.6.
-rw-r--r--ChangeLog9
-rw-r--r--src/autofit/afpic.c2
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ac911bdf..67ccfb606 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2012-01-16 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+ [autofit] Fix the inclusion of "aflatin2.h" in PIC file.
+
+ * src/autofit/afpic.c: Include "aflatin2.h" when
+ FT_OPTION_AUTOFIT2 is defined, as afglobal.c does so.
+ Unconditionally inclusion causes declared but unimplemented
+ warning by GCC 4.6.
+
+2012-01-16 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
[cff] Remove redundant declarations of cff_cmap_XXX_class_rec.
* src/cff/cffpic.c: The declarations of
diff --git a/src/autofit/afpic.c b/src/autofit/afpic.c
index b48e1197c..cd207c06d 100644
--- a/src/autofit/afpic.c
+++ b/src/autofit/afpic.c
@@ -30,7 +30,9 @@
/* forward declaration of PIC init functions from script classes */
#include "aflatin.h"
+#ifdef FT_OPTION_AUTOFIT2
#include "aflatin2.h"
+#endif
#include "afcjk.h"
#include "afdummy.h"
#include "afindic.h"