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

[Behdad Esfahbod]

 src/hb-common.cc  |    2 +-
 src/hb-private.hh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0b8f3ab0220ca4731516313828515f26bb480645
Author: Steve Lhomme <slhomme at matroska.org>
Date:   Mon Jul 11 21:57:26 2016 +0200

    clang in MSVC mode doesn't like when we redefine __attribute__ (#283)

diff --git a/src/hb-private.hh b/src/hb-private.hh
index d58a695..c45be6f 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -83,7 +83,7 @@ extern "C" void  hb_free_impl(void *ptr);
 #define unlikely(expr) (expr)
 #endif
 
-#ifndef __GNUC__
+#if !defined(__GNUC__) && !defined(__clang__)
 #undef __attribute__
 #define __attribute__(x)
 #endif
commit 2f522fd485c2e946c9bce9e3828b6ff6247c59e4
Merge: d3e2a06 e4d451e
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Jul 1 17:09:28 2016 -0700

    Merge pull request #286 from khaledhosny/gi-tag_from_string
    
    [introspection] Fix hb_tag_from_string annotation

commit e4d451ee55a57e1231b4076fcd1e87994f6b9528
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sat Jul 2 00:04:57 2016 +0200

    [introspection] Fix hb_tag_from_string annotation

diff --git a/src/hb-common.cc b/src/hb-common.cc
index 5ef832c..3564e43 100644
--- a/src/hb-common.cc
+++ b/src/hb-common.cc
@@ -88,7 +88,7 @@ hb_tag_from_string (const char *str, int len)
 /**
  * hb_tag_to_string:
  * @tag: 
- * @buf: (array fixed-size=4): 
+ * @buf: (out caller-allocates) (array fixed-size=4) (element-type uint8_t): 
  *
  * 
  *