diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
| commit | 94c763109f74b446e4d5d31e55ef337c8c8d86cb (patch) | |
| tree | 22d1cd06809f5a5c11241e998d9ead4010ac3c91 /package/valgrind/patches/patch-coregrind_launcher-linux_c | |
| parent | a217fc80b29080dae963bb15051df023de36ce39 (diff) | |
| parent | 16d94117a716fc361d3db9a2a17cf4c45eab837d (diff) | |
resolve conflicts
Diffstat (limited to 'package/valgrind/patches/patch-coregrind_launcher-linux_c')
| -rw-r--r-- | package/valgrind/patches/patch-coregrind_launcher-linux_c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/package/valgrind/patches/patch-coregrind_launcher-linux_c b/package/valgrind/patches/patch-coregrind_launcher-linux_c new file mode 100644 index 000000000..e94ffd908 --- /dev/null +++ b/package/valgrind/patches/patch-coregrind_launcher-linux_c @@ -0,0 +1,29 @@ + try to avoid errors regarding already #defined st_atime in bits/stat.h or so +--- valgrind-3.5.0.orig/coregrind/launcher-linux.c 2009-08-19 15:37:47.000000000 +0200 ++++ valgrind-3.5.0/coregrind/launcher-linux.c 2010-12-30 17:08:00.035938916 +0100 +@@ -32,6 +32,12 @@ + and so it doesn't have to conform to Valgrind's arcane rules on + no-glibc-usage etc. */ + ++#include "pub_core_debuglog.h" ++#include "pub_core_vki.h" // Avoids warnings from ++ // pub_core_libcfile.h ++#include "pub_core_libcproc.h" // For VALGRIND_LIB, VALGRIND_LAUNCHER ++#include "pub_core_ume.h" ++ + #include <assert.h> + #include <ctype.h> + #include <elf.h> +@@ -45,12 +51,6 @@ + #include <sys/user.h> + #include <unistd.h> + +-#include "pub_core_debuglog.h" +-#include "pub_core_vki.h" // Avoids warnings from +- // pub_core_libcfile.h +-#include "pub_core_libcproc.h" // For VALGRIND_LIB, VALGRIND_LAUNCHER +-#include "pub_core_ume.h" +- + + + #define PATH_MAX 4096 /* POSIX refers to this a lot but I dunno |