[HB] Move typedef's around

diff --git a/src/hb-blob.h b/src/hb-blob.h
index 21aa365..804cacd 100644 (file)
--- a/src/hb-blob.h
+++ b/src/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/src/hb-common.h b/src/hb-common.h
index 2e127a3..011e865 100644 (file)
--- a/src/hb-common.h
+++ b/src/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/src/hb-font.h b/src/hb-font.h
index 2c85339..e563fa7 100644 (file)
--- a/src/hb-font.h
+++ b/src/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
  */