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

[Behdad Esfahbod]

 src/hb-object-private.h              |    2 +-
 src/hb-open-type-private.hh          |    4 ++--
 src/hb-ot-layout-gsubgpos-private.hh |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ba51b25c7ba568aeced17f016eceba987569c5d9
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Apr 28 13:10:36 2010 -0400

    Fix build.  Ouch!

diff --git a/src/hb-object-private.h b/src/hb-object-private.h
index 163c5c1..81ab6c2 100644
--- a/src/hb-object-private.h
+++ b/src/hb-object-private.h
@@ -42,7 +42,7 @@
 					  HB_REFERENCE_COUNT_GET_VALUE (obj->ref_count), \
 					  __FUNCTION__)
 #else
-#define HB_OBJECT_DEBUG_OUT(obj) (void) 0
+#define HB_OBJECT_DEBUG_OUT(obj) 1
 #endif
 
 
commit a92f0fda7fee9d60b399b8865541bf73e6e30141
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Apr 28 13:09:40 2010 -0400

    Fix debug build

diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index 258a462..f64526c 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -133,7 +133,7 @@ ASSERT_STATIC (sizeof (Type) + 1 <= sizeof (_Null##Type))
 	HB_STMT_START { \
 	    if (sanitize_depth < HB_DEBUG_SANITIZE) \
 		fprintf (stderr, "SANITIZE(%p) %-*d-> %s\n", \
-			 (CharP(this) == CharP(&NullPool)) ? 0 : this, \
+			 (CharP(this) == CharP(&_NullPool)) ? 0 : this, \
 			 sanitize_depth, sanitize_depth, \
 			 __PRETTY_FUNCTION__); \
 	} HB_STMT_END
@@ -170,7 +170,7 @@ _hb_sanitize_init (hb_sanitize_context_t *context,
 
 #if HB_DEBUG_SANITIZE
   fprintf (stderr, "sanitize %p init [%p..%p] (%u bytes)\n",
-	   context->blob, context->start, context->end, context->end - context->start);
+	   blob, context->start, context->end, context->end - context->start);
 #endif
 }
 
diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh
index 73e6283..425ec35 100644
--- a/src/hb-ot-layout-gsubgpos-private.hh
+++ b/src/hb-ot-layout-gsubgpos-private.hh
@@ -44,7 +44,7 @@
 	HB_STMT_START { \
 	    if (apply_depth < HB_DEBUG_APPLY) \
 		fprintf (stderr, "APPLY(%p) %-*d-> %s\n", \
-			 (CharP(this) == CharP(&NullPool)) ? 0 : this, \
+			 (CharP(this) == CharP(&_NullPool)) ? 0 : this, \
 			 apply_depth, apply_depth, \
 			 __PRETTY_FUNCTION__); \
 	} HB_STMT_END