Merged all revisions up to and including 9814 from the DRDDEV branch to the trunk for the files pub_drd_bitmap.h, drd_bitmap.h, drd_bitmap.c and tests/drd_bitmap_test.c.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9816 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/drd/pub_drd_bitmap.h b/drd/pub_drd_bitmap.h
index 2ceb78e..00d2aec 100644
--- a/drd/pub_drd_bitmap.h
+++ b/drd/pub_drd_bitmap.h
@@ -34,6 +34,7 @@
#define __PUB_DRD_BITMAP_H
+#include "drd_basics.h" /* DRD_() */
#include "pub_tool_basics.h" /* Addr, SizeT */
@@ -123,6 +124,6 @@
ULong DRD_(bm_get_bitmap_creation_count)(void);
ULong DRD_(bm_get_bitmap2_node_creation_count)(void);
ULong DRD_(bm_get_bitmap2_creation_count)(void);
-
+ULong DRD_(bm_get_bitmap2_merge_count)(void);
#endif /* __PUB_DRD_BITMAP_H */