--- ftfuncs.c.1.3 2004-08-03 15:06:12.000000000 +0900 +++ ftfuncs.c 2004-08-03 16:06:23.000000000 +0900 @@ -69,6 +69,8 @@ #include "ftfuncs.h" #include "xttcap.h" +#define FREETYPE_VERSION (FREETYPE_MAJOR * 1000000 + FREETYPE_MINOR * 1000 + FREETYPE_PATCH) + /* Work around FreeType bug */ #define WORK_AROUND_UPM 2048 @@ -90,6 +92,12 @@ #define DEFAULT_VERY_LAZY 2 /* Multi-byte only */ /* #define DEFAULT_VERY_LAZY 256 */ /* Unicode only */ +#if (FREETYPE_VERSION < 2001008) +#ifdef DEFAULT_VERY_LAZY +#undef DEFAULT_VERY_LAZY +#endif +#endif + /* Does the X accept noSuchChar? */ #define X_ACCEPTS_NO_SUCH_CHAR /* Does the XAA accept NULL noSuchChar.bits?(dangerous) */ @@ -906,6 +914,7 @@ FT_Do_SBit_Metrics( FT_Face ft_face, FT_Size ft_size, FT_ULong strike_index, FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return ) { +#if (FREETYPE_VERSION >= 2001008) SFNT_Service sfnt; TT_Face face; FT_Error error; @@ -969,6 +978,9 @@ Exit: return error; +#else /* if (FREETYPE_VERSION < 2001008) */ + return -1; +#endif } int