Remove an unnecessary #include that breaks the test on Darwin, and update

the expected output line numbers accordingly.  MERGED FROM DARWIN BRANCH.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8965

diff --git a/exp-ptrcheck/tests/hackedbz2.c b/exp-ptrcheck/tests/hackedbz2.c
index 76b3ad23154e4809ebbaae95e932ae4a7b5886b1..0d3d8d464343cb6192657c20f4a4c8cd0bfb8317 100644 (file)
--- a/exp-ptrcheck/tests/hackedbz2.c
+++ b/exp-ptrcheck/tests/hackedbz2.c
@@ -6421,7 +6421,6 @@ void set_inbuf ( void )
 }
 
 #include <stdio.h>
-#include <malloc.h>
 #include <assert.h>
 
 /* For providing services. */

diff --git a/exp-ptrcheck/tests/hackedbz2.stderr.exp-glibc28-amd64 b/exp-ptrcheck/tests/hackedbz2.stderr.exp-glibc28-amd64
index b3802c2906cd5082678b5536dfd23f0dfcd633fa..805d5256d40809f4ff92b597cb47cb775799961c 100644 (file)
--- a/exp-ptrcheck/tests/hackedbz2.stderr.exp-glibc28-amd64
+++ b/exp-ptrcheck/tests/hackedbz2.stderr.exp-glibc28-amd64
@@ -7,7 +7,7 @@ Invalid read of size 1
    by 0x........: handle_compress (hackedbz2.c:4761)
    by 0x........: BZ2_bzCompress (hackedbz2.c:4831)
    by 0x........: BZ2_bzBuffToBuffCompress (hackedbz2.c:5638)
-   by 0x........: main (hackedbz2.c:6485)
+   by 0x........: main (hackedbz2.c:6484)
  Address 0x........ expected vs actual:
  Expected: global array "myprintf_buf" in object with soname "NONE"
  Actual:   unknown