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

[Behdad Esfahbod]

 src/hb-ot-shape-complex-arabic-fallback.hh |    2 +-
 src/hb-ot-shape-complex-arabic-win1256.hh  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d457e3f0ff9b27616a34e4cc110d3edbf8796841
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Aug 25 12:31:19 2014 -0400

    [arabic] Don't #include __FILE__
    
    Fine!
    
    https://code.google.com/p/chromium/issues/detail?id=406957

diff --git a/src/hb-ot-shape-complex-arabic-win1256.hh b/src/hb-ot-shape-complex-arabic-win1256.hh
index 63ed3f8..082e9df 100644
--- a/src/hb-ot-shape-complex-arabic-win1256.hh
+++ b/src/hb-ot-shape-complex-arabic-win1256.hh
@@ -314,7 +314,7 @@ OT_TABLE_END
  * Include a second time to get the table data...
  */
 #ifdef OT_MEASURE
-#include __FILE__
+#include "hb-ot-shape-complex-arabic-win1256.hh"
 #endif
 
 #define HB_OT_SHAPE_COMPLEX_ARABIC_WIN1256_HH
commit 9ceb673d9c35bb28c9b2ed5359bdd8b23fda0019
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Aug 25 11:48:12 2014 -0400

    [arabic] Allow disabling win1256 fallback code
    
    By defining HB_NO_WIN1256.

diff --git a/src/hb-ot-shape-complex-arabic-fallback.hh b/src/hb-ot-shape-complex-arabic-fallback.hh
index e5b7ed4..dc659e0 100644
--- a/src/hb-ot-shape-complex-arabic-fallback.hh
+++ b/src/hb-ot-shape-complex-arabic-fallback.hh
@@ -207,7 +207,7 @@ struct arabic_fallback_plan_t
 
 static const arabic_fallback_plan_t arabic_fallback_plan_nil = {};
 
-#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(HB_WITH_WIN1256)
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(HB_NO_WIN1256)
 #define HB_WITH_WIN1256
 #endif