[HarfBuzz] harfbuzz-ng: Branch 'master'

[Behdad Esfahbod]

 src/hb-ot-shape-complex-indic.cc   |    4 ++--
 src/hb-ot-shape-complex-private.hh |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e8eedf2687f05372bf5476e84139d01ba67c9f73
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jan 16 16:39:40 2012 -0500

    Avoid enum trailing commas
    
    Based on patch from Jonathan Kew.

diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc
index 4ef19c0..9f50ef2 100644
--- a/src/hb-ot-shape-complex-indic.cc
+++ b/src/hb-ot-shape-complex-indic.cc
@@ -61,7 +61,7 @@ enum indic_position_t {
   POS_BASE,
   POS_ABOVE,
   POS_BELOW,
-  POS_POST,
+  POS_POST
 };
 
 /* Categories used in IndicSyllabicCategory.txt from UCD */
@@ -321,7 +321,7 @@ enum {
   HALF,
   _VATU,
   PSTF,
-  CJCT,
+  CJCT
 };
 
 static const hb_tag_t indic_other_features[] =
diff --git a/src/hb-ot-shape-complex-private.hh b/src/hb-ot-shape-complex-private.hh
index e4c8424..12ac770 100644
--- a/src/hb-ot-shape-complex-private.hh
+++ b/src/hb-ot-shape-complex-private.hh
@@ -55,6 +55,8 @@
 enum hb_ot_complex_shaper_t {
 #define HB_COMPLEX_SHAPER_IMPLEMENT(name) hb_ot_complex_shaper_##name,
   HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS
+  /* Just here to avoid enum trailing comma: */
+  hb_ot_complex_shaper_generic = hb_ot_complex_shaper_default
 #undef HB_COMPLEX_SHAPER_IMPLEMENT
 };