[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 docs/harfbuzz-sections.txt |    2 +-
 src/hb-private.hh          |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3ee15a60358f4d894bbf2431d7a7df38b7acc4ce
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Oct 22 17:03:36 2017 -0400

    Another try at fixing mingw32 build bot fail

diff --git a/src/hb-private.hh b/src/hb-private.hh
index 333199a3..3d617e2a 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -337,10 +337,10 @@ static inline HB_CONST_FUNC unsigned int
 _hb_popcount64 (uint64_t mask)
 {
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-  return __builtin_popcountl (mask);
-#else
-  return _hb_popcount32 (mask) + _hb_popcount32 (mask >> 32);
+  if (sizeof (long) >= sizeof (mask))
+    return __builtin_popcountl (mask);
 #endif
+  return _hb_popcount32 (mask) + _hb_popcount32 (mask >> 32);
 }
 template <typename T> static inline unsigned int _hb_popcount (T mask);
 template <> inline unsigned int _hb_popcount<uint32_t> (uint32_t mask) { return _hb_popcount32 (mask); }
commit bfe0faf1a2d39302129a7202994456afd96694ca
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Oct 22 15:54:50 2017 -0400

    [docs] Deprecate hb_set_invert()

diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt
index 0013b342..51ee56d4 100644
--- a/docs/harfbuzz-sections.txt
+++ b/docs/harfbuzz-sections.txt
@@ -151,6 +151,7 @@ HB_BUFFER_SERIALIZE_FLAGS_DEFAULT
 HB_SCRIPT_CANADIAN_ABORIGINAL
 hb_font_funcs_set_glyph_func
 hb_font_get_glyph_func_t
+hb_set_invert
 </SECTION>
 
 <SECTION>
@@ -518,7 +519,6 @@ hb_set_get_population
 hb_set_get_user_data
 hb_set_has
 hb_set_intersect
-hb_set_invert
 hb_set_is_empty
 hb_set_is_equal
 hb_set_next