patch-defs_h 940 B

123456789101112131415161718192021222324252627282930313233
  1. --- strace-4.8.orig/defs.h 2013-05-14 16:10:42.000000000 +0200
  2. +++ strace-4.8/defs.h 2014-02-26 17:36:34.000000000 +0100
  3. @@ -155,18 +155,18 @@ extern char *stpcpy(char *dst, const cha
  4. || defined(METAG) \
  5. || defined(TILE) \
  6. || defined(XTENSA) \
  7. - ) && defined(__GLIBC__)
  8. + ) && defined(__linux__)
  9. # include <sys/ptrace.h>
  10. #else
  11. /* Work around awkward prototype in ptrace.h. */
  12. # define ptrace xptrace
  13. # include <sys/ptrace.h>
  14. # undef ptrace
  15. -# ifdef POWERPC
  16. +#if defined(POWERPC) && defined(__GLIBC__)
  17. # define __KERNEL__
  18. # include <asm/ptrace.h>
  19. # undef __KERNEL__
  20. -# endif
  21. +#endif
  22. extern long ptrace(int, int, char *, long);
  23. #endif
  24. @@ -222,7 +222,7 @@ extern long ptrace(int, int, char *, lon
  25. # define PTRACE_EVENT_EXIT 6
  26. #endif
  27. -#if !defined(__GLIBC__)
  28. +#if !defined(__GLIBC__) && !defined(PTRACE_PEEKUSER)
  29. # define PTRACE_PEEKUSER PTRACE_PEEKUSR
  30. # define PTRACE_POKEUSER PTRACE_POKEUSR
  31. #endif