[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

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

New commits:
commit 3c13e153fe89d559d33027c0a5b30a19a6de1bad
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Oct 15 14:02:58 2017 +0200

    Try fixing AppVeyor bots

diff --git a/src/hb-private.hh b/src/hb-private.hh
index 9691b086..ea6a8fa4 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -93,7 +93,8 @@ public:
     }
 private:
     void operator&() const;    // whose address can't be taken
-} nullptr = {};                // and whose name is nullptr
+} _hb_nullptr = {};            // and whose name is nullptr
+#define nullptr _hb_nullptr
 
 // Static assertions
 #ifndef static_assert