1 --- harfbuzz-0.9.8/src/hb-private.hh.orig 2012-11-23 23:33:08.000000000 +0100
2 +++ harfbuzz-0.9.8/src/hb-private.hh 2012-12-06 18:21:40.215335229 +0100
6 typedef const _void_t &void_t;
7 -#define VOID (* (const _void_t *) NULL)
8 +#define HBVOID (* (const _void_t *) NULL)
12 --- harfbuzz-0.9.8/src/hb-ot-layout-gsubgpos-private.hh.orig 2012-11-30 07:38:20.000000000 +0100
13 +++ harfbuzz-0.9.8/src/hb-ot-layout-gsubgpos-private.hh 2012-12-06 18:22:07.522001326 +0100
14 @@ -60,8 +60,8 @@ struct hb_closure_context_t
15 typedef void_t return_t;
16 typedef return_t (*recurse_func_t) (hb_closure_context_t *c, unsigned int lookup_index);
18 - inline return_t process (const T &obj) { obj.closure (this); return VOID; }
19 - static return_t default_return_value (void) { return VOID; }
20 + inline return_t process (const T &obj) { obj.closure (this); return HBVOID; }
21 + static return_t default_return_value (void) { return HBVOID; }
22 bool stop_sublookup_iteration (const return_t r) const { return false; }
23 return_t recurse (unsigned int lookup_index)
25 @@ -71,7 +71,7 @@ struct hb_closure_context_t
27 recurse_func (this, lookup_index);
34 @@ -148,8 +148,8 @@ struct hb_collect_glyphs_context_t
35 typedef void_t return_t;
36 typedef return_t (*recurse_func_t) (hb_collect_glyphs_context_t *c, unsigned int lookup_index);
38 - inline return_t process (const T &obj) { obj.collect_glyphs (this); return VOID; }
39 - static return_t default_return_value (void) { return VOID; }
40 + inline return_t process (const T &obj) { obj.collect_glyphs (this); return HBVOID; }
41 + static return_t default_return_value (void) { return HBVOID; }
42 bool stop_sublookup_iteration (const return_t r) const { return false; }
43 return_t recurse (unsigned int lookup_index)
45 @@ -161,7 +161,7 @@ struct hb_collect_glyphs_context_t
46 hb_collect_glyphs_context_t new_c (this->face, NULL, NULL, NULL, &output, nesting_level_left);
47 recurse_func (&new_c, lookup_index);