| diff -r -u -d /home/enh/Downloads/strace-4.8/defs.h ./defs.h |
| --- /home/enh/Downloads/strace-4.8/defs.h 2013-05-14 07:10:42.000000000 -0700 |
| +++ ./defs.h 2014-01-09 14:34:13.520344153 -0800 |
| @@ -222,7 +222,7 @@ |
| # define PTRACE_EVENT_EXIT 6 |
| #endif |
| |
| -#if !defined(__GLIBC__) |
| +#if !defined(__GLIBC__) && !defined(__BIONIC__) |
| # define PTRACE_PEEKUSER PTRACE_PEEKUSR |
| # define PTRACE_POKEUSER PTRACE_POKEUSR |
| #endif |
| diff -r -u -d /home/enh/Downloads/strace-4.8/ioctl.c ./ioctl.c |
| --- /home/enh/Downloads/strace-4.8/ioctl.c 2013-05-02 15:50:55.000000000 -0700 |
| +++ ./ioctl.c 2014-01-08 17:40:04.763917183 -0800 |
| @@ -86,8 +86,10 @@ |
| case 0x03: |
| case 0x12: |
| return block_ioctl(tcp, code, arg); |
| +#ifndef HAVE_ANDROID_OS |
| case 0x22: |
| return scsi_ioctl(tcp, code, arg); |
| +#endif |
| case 'L': |
| return loop_ioctl(tcp, code, arg); |
| case 'M': |
| diff -r -u -d /home/enh/Downloads/strace-4.8/util.c ./util.c |
| --- /home/enh/Downloads/strace-4.8/util.c 2013-05-06 11:23:01.000000000 -0700 |
| +++ ./util.c 2014-01-08 17:40:04.803916706 -0800 |
| @@ -46,7 +46,9 @@ |
| |
| #ifdef HAVE_SYS_REG_H |
| # include <sys/reg.h> |
| -# define PTRACE_PEEKUSR PTRACE_PEEKUSER |
| +# ifndef PTRACE_PEEKUSR |
| +# define PTRACE_PEEKUSR PTRACE_PEEKUSER |
| +# endif |
| #elif defined(HAVE_LINUX_PTRACE_H) |
| # undef PTRACE_SYSCALL |
| # ifdef HAVE_STRUCT_IA64_FPREG |