From 3b98d134e310bb1cf5d549a1eb8a34d66831b9a5 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Thu, 21 Mar 2013 15:42:29 -0700
Subject: Remove our wait4 hack.

Change-Id: I700dbe6e177eecd1457363330b9b9804e2e9a668
---
 Android.patch | 14 --------------
 strace.c      |  3 ---
 2 files changed, 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
diff --git a/strace.c b/strace.c
index a94a19bc..774d172d 100644
--- a/strace.c
+++ b/strace.c
@@ -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>
-- 
cgit v1.2.3