summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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"