[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-machinery.hh |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6f0454e176efdb8b99c8aa59b5ad765ca455b8d6
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Oct 29 13:51:15 2018 -0700

    Fix extra-semicolon warnings

diff --git a/src/hb-machinery.hh b/src/hb-machinery.hh
index 2b238131..a624cf91 100644
--- a/src/hb-machinery.hh
+++ b/src/hb-machinery.hh
@@ -114,11 +114,11 @@ static inline Type& StructAfter(TObject &X)
 #define DEFINE_SIZE_ARRAY(size, array) \
   DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size) + VAR * sizeof (array[0])); \
   DEFINE_COMPILES_ASSERTION ((void) array[0].static_size) \
-  enum { min_size = (size) }; \
+  enum { min_size = (size) } \
 
 #define DEFINE_SIZE_ARRAY_SIZED(size, array) \
-	DEFINE_SIZE_ARRAY(size, array); \
-	inline unsigned int get_size (void) const { return (size - array.min_size + array.get_size ()); }
+	inline unsigned int get_size (void) const { return (size - array.min_size + array.get_size ()); } \
+	DEFINE_SIZE_ARRAY(size, array)
 
 #define DEFINE_SIZE_ARRAY2(size, array1, array2) \
   DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size) + sizeof (this->array1[0]) + sizeof (this->array2[0])); \