Merge r9299..r9303 (various leak-check test fixes) from the DARWIN branch.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9304 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/memcheck/mc_include.h b/memcheck/mc_include.h
index 8519298..0f5f66a 100644
--- a/memcheck/mc_include.h
+++ b/memcheck/mc_include.h
@@ -249,6 +249,13 @@
 extern SizeT MC_(bytes_reachable);
 extern SizeT MC_(bytes_suppressed);
 
+/* For VALGRIND_COUNT_LEAK_BLOCKS client request */
+extern SizeT MC_(blocks_leaked);
+extern SizeT MC_(blocks_indirect);
+extern SizeT MC_(blocks_dubious);
+extern SizeT MC_(blocks_reachable);
+extern SizeT MC_(blocks_suppressed);
+
 typedef
    enum {
       LC_Off,