--- harfbuzz-0.9.8/src/hb-private.hh.orig 2012-11-23 23:33:08.000000000 +0100 +++ harfbuzz-0.9.8/src/hb-private.hh 2012-12-06 18:21:40.215335229 +0100 @@ -65,7 +65,7 @@ /* Void! */ struct _void_t; typedef const _void_t &void_t; -#define VOID (* (const _void_t *) NULL) +#define HBVOID (* (const _void_t *) NULL) /* Basics */ --- harfbuzz-0.9.8/src/hb-ot-layout-gsubgpos-private.hh.orig 2012-11-30 07:38:20.000000000 +0100 +++ harfbuzz-0.9.8/src/hb-ot-layout-gsubgpos-private.hh 2012-12-06 18:22:07.522001326 +0100 @@ -60,8 +60,8 @@ struct hb_closure_context_t typedef void_t return_t; typedef return_t (*recurse_func_t) (hb_closure_context_t *c, unsigned int lookup_index); template - inline return_t process (const T &obj) { obj.closure (this); return VOID; } - static return_t default_return_value (void) { return VOID; } + inline return_t process (const T &obj) { obj.closure (this); return HBVOID; } + static return_t default_return_value (void) { return HBVOID; } bool stop_sublookup_iteration (const return_t r) const { return false; } return_t recurse (unsigned int lookup_index) { @@ -71,7 +71,7 @@ struct hb_closure_context_t nesting_level_left--; recurse_func (this, lookup_index); nesting_level_left++; - return VOID; + return HBVOID; } hb_face_t *face; @@ -148,8 +148,8 @@ struct hb_collect_glyphs_context_t typedef void_t return_t; typedef return_t (*recurse_func_t) (hb_collect_glyphs_context_t *c, unsigned int lookup_index); template - inline return_t process (const T &obj) { obj.collect_glyphs (this); return VOID; } - static return_t default_return_value (void) { return VOID; } + inline return_t process (const T &obj) { obj.collect_glyphs (this); return HBVOID; } + static return_t default_return_value (void) { return HBVOID; } bool stop_sublookup_iteration (const return_t r) const { return false; } return_t recurse (unsigned int lookup_index) { @@ -161,7 +161,7 @@ struct hb_collect_glyphs_context_t hb_collect_glyphs_context_t new_c (this->face, NULL, NULL, NULL, &output, nesting_level_left); recurse_func (&new_c, lookup_index); nesting_level_left++; - return VOID; + return HBVOID; } hb_face_t *face;