commit 68e12e68f813bfd22dda040463d042cc06b958ec
author Behdad Esfahbod <behdad@behdad.org> Mon May 13 17:28:59 2019 -0700
committer Behdad Esfahbod <behdad@behdad.org> Mon May 13 17:28:59 2019 -0700
tree 3bc3eba06014cc41f12f3d407cc0b01c1a13fba5
parent 4d3cf2adb669c345cc43832d11689271995e160a

Fix more semi-colon issues

src/hb-coretext.cc

diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc
index 3834285..85993d1 100644
--- a/src/hb-coretext.cc
+++ b/src/hb-coretext.cc
@@ -608,7 +608,7 @@
 
 #define ALLOCATE_ARRAY(Type, name, len, on_no_room) \
   Type *name = (Type *) scratch; \
-  { \
+  do { \
     unsigned int _consumed = DIV_CEIL ((len) * sizeof (Type), sizeof (*scratch)); \
     if (unlikely (_consumed > scratch_size)) \
     { \
@@ -617,7 +617,7 @@
     } \
     scratch += _consumed; \
     scratch_size -= _consumed; \
-  }
+  } while (0)
 
   ALLOCATE_ARRAY (UniChar, pchars, buffer->len * 2, /*nothing*/);
   unsigned int chars_len = 0;

src/hb-directwrite.cc

diff --git a/src/hb-directwrite.cc b/src/hb-directwrite.cc
index 6b2761e..057ae33 100644
--- a/src/hb-directwrite.cc
+++ b/src/hb-directwrite.cc
@@ -530,12 +530,12 @@
   hb_buffer_t::scratch_buffer_t *scratch = buffer->get_scratch_buffer (&scratch_size);
 #define ALLOCATE_ARRAY(Type, name, len) \
   Type *name = (Type *) scratch; \
-  { \
+  do { \
     unsigned int _consumed = DIV_CEIL ((len) * sizeof (Type), sizeof (*scratch)); \
     assert (_consumed <= scratch_size); \
     scratch += _consumed; \
     scratch_size -= _consumed; \
-  }
+  } while (0)
 
 #define utf16_index() var1.u32
 

src/hb-graphite2.cc

diff --git a/src/hb-graphite2.cc b/src/hb-graphite2.cc
index 5b1ba45..f799f8b 100644
--- a/src/hb-graphite2.cc
+++ b/src/hb-graphite2.cc
@@ -310,12 +310,12 @@
 
 #define ALLOCATE_ARRAY(Type, name, len) \
   Type *name = (Type *) scratch; \
-  { \
+  do { \
     unsigned int _consumed = DIV_CEIL ((len) * sizeof (Type), sizeof (*scratch)); \
     assert (_consumed <= scratch_size); \
     scratch += _consumed; \
     scratch_size -= _consumed; \
-  }
+  } while (0)
 
   ALLOCATE_ARRAY (hb_graphite2_cluster_t, clusters, buffer->len);
   ALLOCATE_ARRAY (hb_codepoint_t, gids, glyph_count);

src/hb-uniscribe.cc

diff --git a/src/hb-uniscribe.cc b/src/hb-uniscribe.cc
index 4e00441..f97ed91 100644
--- a/src/hb-uniscribe.cc
+++ b/src/hb-uniscribe.cc
@@ -728,12 +728,12 @@
 
 #define ALLOCATE_ARRAY(Type, name, len) \
   Type *name = (Type *) scratch; \
-  { \
+  do { \
     unsigned int _consumed = DIV_CEIL ((len) * sizeof (Type), sizeof (*scratch)); \
     assert (_consumed <= scratch_size); \
     scratch += _consumed; \
     scratch_size -= _consumed; \
-  }
+  } while (0)
 
 #define utf16_index() var1.u32