Commit 8a5cea2616e799ec0354d59d1141b29de387193d

suzuki toshiya 2012-01-16T20:41:53

[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.

diff --git a/ChangeLog b/ChangeLog
index 9ac911b..67ccfb6 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 b48e119..cd207c0 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"