patch-coregrind_launcher-linux_c 1.0 KB

1234567891011121314151617181920212223242526272829
  1. try to avoid errors regarding already #defined st_atime in bits/stat.h or so
  2. --- valgrind-3.5.0.orig/coregrind/launcher-linux.c 2009-08-19 15:37:47.000000000 +0200
  3. +++ valgrind-3.5.0/coregrind/launcher-linux.c 2010-12-30 17:08:00.035938916 +0100
  4. @@ -32,6 +32,12 @@
  5. and so it doesn't have to conform to Valgrind's arcane rules on
  6. no-glibc-usage etc. */
  7. +#include "pub_core_debuglog.h"
  8. +#include "pub_core_vki.h" // Avoids warnings from
  9. + // pub_core_libcfile.h
  10. +#include "pub_core_libcproc.h" // For VALGRIND_LIB, VALGRIND_LAUNCHER
  11. +#include "pub_core_ume.h"
  12. +
  13. #include <assert.h>
  14. #include <ctype.h>
  15. #include <elf.h>
  16. @@ -45,12 +51,6 @@
  17. #include <sys/user.h>
  18. #include <unistd.h>
  19. -#include "pub_core_debuglog.h"
  20. -#include "pub_core_vki.h" // Avoids warnings from
  21. - // pub_core_libcfile.h
  22. -#include "pub_core_libcproc.h" // For VALGRIND_LIB, VALGRIND_LAUNCHER
  23. -#include "pub_core_ume.h"
  24. -
  25. #define PATH_MAX 4096 /* POSIX refers to this a lot but I dunno