summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2009-08-19 18:07:36 -0400
committerBehdad Esfahbod <behdad@behdad.org>2009-08-19 18:07:36 -0400
commit6f73b497a2f4d22611a136ef360b68a78547074f (patch)
tree578a5897abd6709197cc275830e35087b89738af
parent392f1f1ddb24c0e7d1d64ee8d36c739ac6482b81 (diff)
downloadpango-6f73b497a2f4d22611a136ef360b68a78547074f.tar.gz
[HB] Rename CAIRO_ in macro prefix to HB_
Hiss!
-rw-r--r--pango/opentype/hb-private.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/pango/opentype/hb-private.h b/pango/opentype/hb-private.h
index cdc2b845..8d885aa4 100644
--- a/pango/opentype/hb-private.h
+++ b/pango/opentype/hb-private.h
@@ -132,7 +132,7 @@ typedef GStaticMutex hb_mutex_t;
#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
-#define _CAIRO_BOOLEAN_EXPR(expr) \
+#define _HB_BOOLEAN_EXPR(expr) \
__extension__ ({ \
int _cairo_boolean_var_; \
if (expr) \
@@ -141,8 +141,8 @@ typedef GStaticMutex hb_mutex_t;
_cairo_boolean_var_ = 0; \
_cairo_boolean_var_; \
})
-#define HB_LIKELY(expr) (__builtin_expect (_CAIRO_BOOLEAN_EXPR(expr), 1))
-#define HB_UNLIKELY(expr) (__builtin_expect (_CAIRO_BOOLEAN_EXPR(expr), 0))
+#define HB_LIKELY(expr) (__builtin_expect (_HB_BOOLEAN_EXPR(expr), 1))
+#define HB_UNLIKELY(expr) (__builtin_expect (_HB_BOOLEAN_EXPR(expr), 0))
#else
#define HB_LIKELY(expr) (expr)
#define HB_UNLIKELY(expr) (expr)