Reduce spurious diffs with upstream.
Bug: 9469682
Change-Id: I69260ab36fa5eb02c979cea38d0ed2e100e1acbb
diff --git a/ping.c b/ping.c
index 25bbc3c..5c5d09e 100644
--- a/ping.c
+++ b/ping.c
@@ -75,7 +75,6 @@
#ifdef ANDROID
#include <sys/auxv.h>
-#define bcmp(a, b, c) memcmp(a, b, c)
#endif
#define MAXIPLEN 60
@@ -120,6 +119,7 @@
char *device;
int pmtudisc = -1;
+
int
main(int argc, char **argv)
{
diff --git a/ping_common.c b/ping_common.c
index 2bdd6f9..0342e1a 100644
--- a/ping_common.c
+++ b/ping_common.c
@@ -630,6 +630,7 @@
fprintf(stderr, "Warning: no SO_TIMESTAMP support, falling back to SIOCGSTAMP\n");
}
#endif
+#ifdef SO_MARK
if (options & F_MARK) {
int ret;
@@ -644,6 +645,7 @@
fprintf(stderr, "Warning: Failed to set mark %d\n", mark);
}
}
+#endif
/* Set some SNDTIMEO to prevent blocking forever
* on sends, when device is too slow or stalls. Just put limit