diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-08 18:15:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-08 18:15:32 +0000 |
| commit | aea31bedcf1dcacafea00d93b23699f48b8afb06 (patch) | |
| tree | 4a6f967490821641ea87a23b60e939a57f5ccc8f | |
| parent | 89ff489006afe0406fa5b22a8bb704d276d3f554 (diff) | |
| parent | aa1b5eae9c5281b519691d3026f38e834e57556a (diff) | |
| download | ping-aea31bedcf1dcacafea00d93b23699f48b8afb06.tar.gz | |
Merge "Remove hacks now we've fixed bionic."
| -rw-r--r-- | ping6.c | 14 |
1 files changed, 0 insertions, 14 deletions
@@ -112,20 +112,6 @@ char copyright[] = #define BIT_SET(nr, addr) do { ((__u32 *)(addr))[(nr) >> 5] |= (1U << ((nr) & 31)); } while(0) #define BIT_TEST(nr, addr) do { (__u32 *)(addr))[(nr) >> 5] & (1U << ((nr) & 31)); } while(0) -/* ICMP6_FILTER is defined in linux/icmpv6.h, which we can't include because it - * defines struct icmp6_filter, also defined in netinet/icmp6.h. Also, undefine - * the ICMP6_FILTER_XXX macros, because the ones provided by netinet/icmp6.h - * don't work on Linux - http://b/9671560 . */ -#ifdef ANDROID -#define ICMP6_FILTER 1 -#undef ICMP6_FILTER_WILLPASS -#undef ICMP6_FILTER_WILLBLOCK -#undef ICMP6_FILTER_SETPASS -#undef ICMP6_FILTER_SETBLOCK -#undef ICMP6_FILTER_SETPASSALL -#undef ICMP6_FILTER_SETBLOCKALL -#endif - #ifndef ICMP6_FILTER_WILLPASS #define ICMP6_FILTER_WILLPASS(type, filterp) \ (BIT_TEST((type), filterp) == 0) |