[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

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

New commits:
commit 8cef3a61995317d3a5724221108647d7e66fe24a
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Feb 9 16:04:23 2018 -0600

    Try fixing build with Sun Studio
    
    Trying to fix:
    https://circleci.com/gh/harfbuzz/harfbuzz/6635
    
    Also part of:
    https://github.com/harfbuzz/harfbuzz/issues/630

diff --git a/src/hb-private.hh b/src/hb-private.hh
index 59d732af..cfd816ba 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -120,7 +120,9 @@ extern "C" void  hb_free_impl(void *ptr);
 #endif
 
 #ifndef HB_INTERNAL
-# if !defined(__MINGW32__) && !defined(__CYGWIN__)
+# ifdef __SUNPRO_CC
+#  define HB_INTERNAL __hidden
+# elif !defined(__MINGW32__) && !defined(__CYGWIN__)
 #  define HB_INTERNAL __attribute__((__visibility__("hidden")))
 # else
 #  define HB_INTERNAL
@@ -136,6 +138,11 @@ extern "C" void  hb_free_impl(void *ptr);
 #define HB_FUNC __func__
 #endif
 
+#ifdef __SUNPRO_CC
+/* https://github.com/harfbuzz/harfbuzz/issues/630 */
+#define __restrict
+#endif
+
 /*
  * Borrowed from https://bugzilla.mozilla.org/show_bug.cgi?id=1215411
  * HB_FALLTHROUGH is an annotation to suppress compiler warnings about switch