diff options
| author | Elliott Hughes <enh@google.com> | 2013-03-21 15:42:29 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-03-21 15:42:29 -0700 |
| commit | 3b98d134e310bb1cf5d549a1eb8a34d66831b9a5 (patch) | |
| tree | 6c47ce42b7e6b345414866eca9b32f8d2fe77dd6 | |
| parent | 7d2d23fd9b87c3a1fc61a51e6cb62923d952fb79 (diff) | |
| download | android_external_strace-3b98d134e310bb1cf5d549a1eb8a34d66831b9a5.tar.gz android_external_strace-3b98d134e310bb1cf5d549a1eb8a34d66831b9a5.tar.bz2 android_external_strace-3b98d134e310bb1cf5d549a1eb8a34d66831b9a5.zip | |
Remove our wait4 hack.
Change-Id: I700dbe6e177eecd1457363330b9b9804e2e9a668
| -rw-r--r-- | Android.patch | 14 | ||||
| -rw-r--r-- | strace.c | 3 |
2 files changed, 0 insertions, 17 deletions
diff --git a/Android.patch b/Android.patch index c7f36d81..d30d616a 100644 --- a/Android.patch +++ b/Android.patch @@ -146,20 +146,6 @@ diff -r -u -d /Users/jeffbrown/Downloads/strace-4.6/signal.c ./signal.c /* Type for data associated with a signal. */ typedef union sigval { -diff -r -u -d /Users/jeffbrown/Downloads/strace-4.6/strace.c ./strace.c ---- /Users/jeffbrown/Downloads/strace-4.6/strace.c 2011-03-10 14:25:03.000000000 -0800 -+++ ./strace.c 2012-03-02 16:55:15.000000000 -0800 -@@ -38,7 +38,10 @@ - #include <sys/param.h> - #include <fcntl.h> - #include <sys/resource.h> -+#ifdef HAVE_ANDROID_OS -+#define wait4 __wait4 - #include <sys/wait.h> -+#endif - #include <sys/stat.h> - #include <pwd.h> - #include <grp.h> diff -r -u -d /Users/jeffbrown/Downloads/strace-4.6/syscall.c ./syscall.c --- /Users/jeffbrown/Downloads/strace-4.6/syscall.c 2011-02-18 16:02:27.000000000 -0800 +++ ./syscall.c 2012-03-02 15:00:35.000000000 -0800 @@ -38,10 +38,7 @@ #include <sys/param.h> #include <fcntl.h> #include <sys/resource.h> -#ifdef HAVE_ANDROID_OS -#define wait4 __wait4 #include <sys/wait.h> -#endif #include <sys/stat.h> #include <pwd.h> #include <grp.h> |