Make sure TTAG_GDEF and frineds are defined, needed for FreeType <= 2.1.7

2006-04-03  Behdad Esfahbod  <behdad@gnome.org>

        * pango/opentype/harfbuzz-impl.h: Make sure TTAG_GDEF and frineds are
        defined, needed for FreeType <= 2.1.7 (pointed by Tim Janik).

src/harfbuzz-gdef.c

@@ -14,9 +14,6 @@
 #include "harfbuzz-gdef-private.h"
 #include "harfbuzz-open-private.h"
 
-#include FT_TRUETYPE_TAGS_H
-
-
 static FT_Error  Load_AttachList( HB_AttachList*  al,
 				  FT_Stream        stream );
 static FT_Error  Load_LigCaretList( HB_LigCaretList*  lcl,

src/harfbuzz-gpos.c

@@ -15,9 +15,6 @@
 #include "harfbuzz-open-private.h"
 #include "harfbuzz-gdef-private.h"
 
-#include FT_TRUETYPE_TAGS_H
-
-
 struct  GPOS_Instance_
 {
   HB_GPOSHeader*  gpos;

src/harfbuzz-gsub.c

@@ -15,9 +15,6 @@
 #include "harfbuzz-open-private.h"
 #include "harfbuzz-gdef-private.h"
 
-#include FT_TRUETYPE_TAGS_H
-
-
 static FT_Error  GSUB_Do_Glyph_Lookup( HB_GSUBHeader*   gsub,
 				       FT_UShort         lookup_index,
 				       HB_Buffer        buffer,

src/harfbuzz-impl.h

@@ -15,6 +15,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
+#include FT_TRUETYPE_TAGS_H
 
 FT_BEGIN_HEADER
 
@@ -30,6 +31,16 @@ FT_BEGIN_HEADER
 # define TRUE 1
 #endif
 
+#ifndef TTAG_GDEF
+# define TTAG_GDEF  FT_MAKE_TAG( 'G', 'D', 'E', 'F' )
+#endif
+#ifndef TTAG_GPOS
+# define TTAG_GPOS  FT_MAKE_TAG( 'G', 'P', 'O', 'S' )
+#endif
+#ifndef TTAG_GSUB
+# define TTAG_GSUB  FT_MAKE_TAG( 'G', 'S', 'U', 'B' )
+#endif
+
 #include "ftglue.h"
 
 #define ARRAY_LEN(Array) ((int)(sizeof (Array) / sizeof (Array)[0]))