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

[Behdad Esfahbod]

 src/hb-font.cc |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit ce8ae9970102f83b67bb1e8e8b2bf894a0e26c07
Merge: 731a430 71248a8
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Mar 4 17:20:35 2016 -0800

    Merge pull request #231 from KonstantinRitt/post123buildfix
    
    Fix build with HB_DISABLE_DEPRECATED

commit 71248a843f976c86022eb5bb8c6e8880b2499937
Author: Konstantin Ritt <ritt.ks at gmail.com>
Date:   Thu Feb 25 18:55:28 2016 +0400

    Fix build with HB_DISABLE_DEPRECATED
    
    When HB_DISABLE_DEPRECATED is defined, no code from hb-deprecated.h
    should be used, even from within HB itself.

diff --git a/src/hb-font.cc b/src/hb-font.cc
index 4953d00..6a4823a 100644
--- a/src/hb-font.cc
+++ b/src/hb-font.cc
@@ -1538,6 +1538,8 @@ hb_font_get_ppem (hb_font_t *font,
 }
 
 
+#ifndef HB_DISABLE_DEPRECATED
+
 /*
  * Deprecated get_glyph_func():
  */
@@ -1660,3 +1662,5 @@ hb_font_funcs_set_glyph_func (hb_font_funcs_t *ffuncs,
 					  trampoline,
 					  trampoline_destroy);
 }
+
+#endif /* HB_DISABLE_DEPRECATED */