[pango/harfbuzz-ng: 19/57] [HB] Move typedef's around

[Behdad Esfahbod <behdad src gnome org>]

commit b0285768b9ea64f0d523edf14232ab870deacb9c
Author: Behdad Esfahbod <behdad behdad org>
Date:   Sat Aug 1 21:38:39 2009 -0400

    [HB] Move typedef's around

 pango/opentype/hb-blob.h   |    2 ++
 pango/opentype/hb-common.h |    9 ---------
 pango/opentype/hb-font.h   |   10 ++++++++++
 3 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/pango/opentype/hb-blob.h b/pango/opentype/hb-blob.h
index 21aa365..804cacd 100644
--- a/pango/opentype/hb-blob.h
+++ b/pango/opentype/hb-blob.h
@@ -39,6 +39,8 @@ typedef enum {
   HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITEABLE,
 } hb_memory_mode_t;
 
+typedef struct _hb_blob_t hb_blob_t;
+
 hb_blob_t *
 hb_blob_create (const char        *data,
 		unsigned int       len,
diff --git a/pango/opentype/hb-common.h b/pango/opentype/hb-common.h
index 2e127a3..011e865 100644
--- a/pango/opentype/hb-common.h
+++ b/pango/opentype/hb-common.h
@@ -50,15 +50,6 @@ typedef uint32_t hb_codepoint_t;
 typedef int32_t hb_position_t;
 typedef int32_t hb_16dot16_t;
 
-typedef struct _hb_blob_t hb_blob_t;
 typedef void (*hb_destroy_func_t) (void *user_data);
 
-typedef struct _hb_font_callbacks_t hb_font_callbacks_t;
-typedef struct _hb_unicode_callbacks_t hb_unicode_callbacks_t;
-
-typedef struct _hb_face_t hb_face_t;
-typedef struct _hb_font_t hb_font_t;
-
-typedef hb_blob_t * (*hb_get_table_func_t)  (hb_tag_t tag, void *user_data);
-
 #endif /* HB_COMMON_H */
diff --git a/pango/opentype/hb-font.h b/pango/opentype/hb-font.h
index 2c85339..e563fa7 100644
--- a/pango/opentype/hb-font.h
+++ b/pango/opentype/hb-font.h
@@ -28,9 +28,19 @@
 #define HB_FONT_H
 
 #include "hb-common.h"
+#include "hb-blob.h"
 
 HB_BEGIN_DECLS
 
+typedef struct _hb_font_callbacks_t hb_font_callbacks_t;
+typedef struct _hb_unicode_callbacks_t hb_unicode_callbacks_t;
+
+typedef struct _hb_face_t hb_face_t;
+typedef struct _hb_font_t hb_font_t;
+
+typedef hb_blob_t * (*hb_get_table_func_t)  (hb_tag_t tag, void *user_data);
+
+
 /*
  * hb_font_callbacks_t
  */