[HB] More buffer cleanup

[framework/uifw/harfbuzz.git] / src / hb-private.h

diff --git a/src/hb-private.h b/src/hb-private.h
index f67bd57..0d1e1a7 100644 (file)
--- a/src/hb-private.h
+++ b/src/hb-private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007,2008  Red Hat, Inc.
+ * Copyright (C) 2007,2008,2009  Red Hat, Inc.
  *
  *  This is part of HarfBuzz, an OpenType Layout engine library.
  *
@@ -27,6 +27,8 @@
 #ifndef HB_PRIVATE_H
 #define HB_PRIVATE_H
 
+#include <hb-common.h>
+
 #include <glib.h>
 
 /* Macros to convert to/from BigEndian */
@@ -39,12 +41,36 @@
 #define hb_be_uint64_t GUINT64_TO_BE
 #define hb_be_int64_t  GINT64_TO_BE
 
-#define HB_LIKELY      G_LIKEYLY
+#define HB_LIKELY      G_LIKELY
 #define HB_UNLIKELY    G_UNLIKELY
 #define HB_UNUSED(arg) ((arg) = (arg))
+#define HB_GNUC_UNUSED G_GNUC_UNUSED
+
+
+#include <stdlib.h>
+#include <stdio.h> /* XXX */
+
+/* Basics */
+
+#undef MIN
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+
+#ifndef HB_INTERNAL
+# define HB_INTERNAL
+#endif
+
+#ifndef NULL
+# define NULL ((void *)0)
+#endif
 
+#ifndef FALSE
+# define FALSE 0
+#endif
+
+#ifndef TRUE
+# define TRUE 1
+#endif
 
-#include <assert.h>
 
 #define _ASSERT_STATIC1(_line, _cond) typedef int _static_assert_on_line_##_line##_failed[(_cond)?1:-1]
 #define _ASSERT_STATIC0(_line, _cond) _ASSERT_STATIC1 (_line, (_cond))
@@ -52,4 +78,26 @@
 
 #define ASSERT_SIZE(_type, _size) ASSERT_STATIC (sizeof (_type) == (_size))
 
+
+/* Return the number of 1 bits in mask.
+ *
+ * GCC 3.4 supports a "population count" builtin, which on many targets is
+ * implemented with a single instruction. There is a fallback definition
+ * in libgcc in case a target does not have one, which should be just as
+ * good as the open-coded solution below, (which is "HACKMEM 169").
+ */
+static inline unsigned int
+_hb_popcount32 (uint32_t mask)
+{
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+    return __builtin_popcount (mask);
+#else
+    register int y;
+
+    y = (mask >> 1) &033333333333;
+    y = mask - y - ((y >>1) & 033333333333);
+    return (((y + (y >> 3)) & 030707070707) % 077);
+#endif
+}
+
 #endif /* HB_PRIVATE_H */