From: handa <handa>
Date: Thu, 31 Jan 2008 02:52:55 +0000 (+0000)
Subject: Fix previous change.
X-Git-Tag: REL-1-5-1
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=89e98bff4bec4739f55df20763ff3a0f0e83537f;p=m17n%2Fm17n-lib.git

Fix previous change.
---

diff --git a/src/font.h b/src/font.h
index 423d976..4d4318f 100644
--- a/src/font.h
+++ b/src/font.h
@@ -257,6 +257,7 @@ extern void mfont__flt_fini ();
 #ifdef HAVE_FREETYPE
 #include <ft2build.h>
 #include FT_FREETYPE_H
+#endif
 
 #ifdef HAVE_FONTCONFIG
 #include <fontconfig/fontconfig.h>
@@ -268,31 +269,6 @@ extern void mfont__flt_fini ();
 typedef unsigned OTF_Tag;
 #endif /* not HAVE_OTF */
 
-extern MFontDriver mfont__ft_driver;
-
-extern int mfont__ft_init ();
-
-extern void mfont__ft_fini ();
-
-extern int mfont__ft_parse_name (const char *name, MFont *font);
-
-extern char *mfont__ft_unparse_name (MFont *font);
-
-#ifdef HAVE_OTF
-
-extern int mfont__ft_drive_otf (MGlyphString *gstring, int from, int to,
-				MFontCapability *capability);
-
-extern int mfont__ft_decode_otf (MGlyph *g);
-
-#endif	/* HAVE_OTF */
-
-#else  /* not HAVE_FREETYPE */
-
-typedef unsigned OTF_Tag;
-
-#endif /* not HAVE_FREETYPE */
-
 enum MFontOpenTypeTable
   {
     MFONT_OTT_GSUB,
@@ -315,6 +291,28 @@ typedef struct
   } features[MFONT_OTT_MAX];
 } MFontCapability;
 
+#ifdef HAVE_FREETYPE
+extern MFontDriver mfont__ft_driver;
+
+extern int mfont__ft_init ();
+
+extern void mfont__ft_fini ();
+
+extern int mfont__ft_parse_name (const char *name, MFont *font);
+
+extern char *mfont__ft_unparse_name (MFont *font);
+
+#ifdef HAVE_OTF
+
+extern int mfont__ft_drive_otf (MGlyphString *gstring, int from, int to,
+				MFontCapability *capability);
+
+extern int mfont__ft_decode_otf (MGlyph *g);
+
+#endif	/* HAVE_OTF */
+
+#endif /* HAVE_FREETYPE */
+
 extern void mfont__free_realized (MRealizedFont *rfont);
 
 extern int mfont__match_p (MFont *font, MFont *spec, int prop);