diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2009-11-02 14:35:51 -0500 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2009-11-02 14:38:33 -0500 |
| commit | ce48f03946bef895912019046bdbe62bb1301d0b (patch) | |
| tree | db45789df9e20f4b119eeb8f6cf9e2d257558799 /src/harfbuzz-impl.h | |
| parent | 0e13beeb93077750183a8242780158b88df81e26 (diff) | |
| parent | 2d15e72c75931398db5e027e660f1320bb979117 (diff) | |
| download | harfbuzz-ng-mergepoint.tar.gz | |
Merge harfbuzz-ngng-mergepoint
Diffstat (limited to 'src/harfbuzz-impl.h')
| -rw-r--r-- | src/harfbuzz-impl.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/harfbuzz-impl.h b/src/harfbuzz-impl.h index f886e676..29101f87 100644 --- a/src/harfbuzz-impl.h +++ b/src/harfbuzz-impl.h @@ -34,6 +34,9 @@ #include <stdlib.h> +/* XXX */ +#include "hb-ot-layout-private.h" + HB_BEGIN_HEADER #ifndef HB_INTERNAL @@ -66,8 +69,12 @@ HB_BEGIN_HEADER # define HB_UNUSED(arg) ((arg) = (arg)) #endif -#define HB_LIKELY(cond) (cond) -#define HB_UNLIKELY(cond) (cond) +#ifndef HB_LIKELY +# define HB_LIKELY(cond) (cond) +#endif +#ifndef HB_UNLIKELY +# define HB_UNLIKELY(cond) (cond) +#endif #define ALLOC(_ptr,_size) \ |