[HB] Rename CAIRO_ in macro prefix to HB_

Hiss!
This commit is contained in:
Behdad Esfahbod 2009-08-19 18:07:36 -04:00
parent 388ad037ff
commit 9d2e02db74

View File

@ -132,7 +132,7 @@ typedef GStaticMutex hb_mutex_t;
#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__) #if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
#define _CAIRO_BOOLEAN_EXPR(expr) \ #define _HB_BOOLEAN_EXPR(expr) \
__extension__ ({ \ __extension__ ({ \
int _cairo_boolean_var_; \ int _cairo_boolean_var_; \
if (expr) \ if (expr) \
@ -141,8 +141,8 @@ typedef GStaticMutex hb_mutex_t;
_cairo_boolean_var_ = 0; \ _cairo_boolean_var_ = 0; \
_cairo_boolean_var_; \ _cairo_boolean_var_; \
}) })
#define HB_LIKELY(expr) (__builtin_expect (_CAIRO_BOOLEAN_EXPR(expr), 1)) #define HB_LIKELY(expr) (__builtin_expect (_HB_BOOLEAN_EXPR(expr), 1))
#define HB_UNLIKELY(expr) (__builtin_expect (_CAIRO_BOOLEAN_EXPR(expr), 0)) #define HB_UNLIKELY(expr) (__builtin_expect (_HB_BOOLEAN_EXPR(expr), 0))
#else #else
#define HB_LIKELY(expr) (expr) #define HB_LIKELY(expr) (expr)
#define HB_UNLIKELY(expr) (expr) #define HB_UNLIKELY(expr) (expr)