[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-private.hh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a5e4f6d6088f6ed37fb1d68d3682b8eb4c9b46fe
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jun 10 10:57:46 2015 -0700

    Fix warnings: "member call on null pointer of type"
    
    https://bugzilla.mozilla.org/show_bug.cgi?id=1167119

diff --git a/src/hb-private.hh b/src/hb-private.hh
index 06d7f22..45afc20 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -247,8 +247,8 @@ ASSERT_STATIC (sizeof (hb_var_int_t) == 4);
 
 /* Void! */
 struct _hb_void_t {};
-typedef const _hb_void_t &hb_void_t;
-#define HB_VOID (* (const _hb_void_t *) NULL)
+typedef const _hb_void_t *hb_void_t;
+#define HB_VOID ((const _hb_void_t *) NULL)
 
 /* Return the number of 1 bits in mask. */
 static inline HB_CONST_FUNC unsigned int