Unbreak the build on several setups :

It looks like the standard says that
   #define __STDC_FORMAT_MACROS
is needed in c++ in order to have PRIxPTR defined.

At least on gcc110 g++ 4.7.2, leak_cpp_interior.cpp
was not compiling.

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

diff --git a/memcheck/tests/leak_cpp_interior.cpp b/memcheck/tests/leak_cpp_interior.cpp
index 497fa8700ae06852370e9d64977a00c5e5cbbca3..f66fc8946fa928ad0d4d5618fef18caf483eb315 100644 (file)
--- a/memcheck/tests/leak_cpp_interior.cpp
+++ b/memcheck/tests/leak_cpp_interior.cpp
@@ -1,3 +1,4 @@
+#define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 #include <stdio.h>
 #include <unistd.h>

diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp b/memcheck/tests/leak_cpp_interior.stderr.exp
index 2ab2787348b65cd1b55b2daa2e238c6c2200c2b1..3228f7483257025144bac79f3a55a762177851ca 100644 (file)
--- a/memcheck/tests/leak_cpp_interior.stderr.exp
+++ b/memcheck/tests/leak_cpp_interior.stderr.exp
@@ -2,8 +2,8 @@
 valgrind output will go to log
 VALGRIND_DO_LEAK_CHECK
 4 bytes in 1 blocks are definitely lost in loss record ... of ...
-   by 0x........: doit() (leak_cpp_interior.cpp:114)
-   by 0x........: main (leak_cpp_interior.cpp:129)
+   by 0x........: doit() (leak_cpp_interior.cpp:115)
+   by 0x........: main (leak_cpp_interior.cpp:130)
 
 LEAK SUMMARY:
    definitely lost: 4 bytes in 1 blocks

diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit
index 8bc77a4cf38ff98945f9d48c50e56f6e8457a4e4..7a862a3cce4f8e998310fb7a23cf4df8f5c6e568 100644 (file)
--- a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit
+++ b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit
@@ -2,8 +2,8 @@
 valgrind output will go to log
 VALGRIND_DO_LEAK_CHECK
 8 bytes in 1 blocks are definitely lost in loss record ... of ...
-   by 0x........: doit() (leak_cpp_interior.cpp:114)
-   by 0x........: main (leak_cpp_interior.cpp:129)
+   by 0x........: doit() (leak_cpp_interior.cpp:115)
+   by 0x........: main (leak_cpp_interior.cpp:130)
 
 LEAK SUMMARY:
    definitely lost: 8 bytes in 1 blocks