diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2013-07-09 08:02:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-09 08:02:59 +0000 |
| commit | 8611672f5cc76dcb655e4bc60694986a24cce4c8 (patch) | |
| tree | 0d92c0daeb594423026e4536be4754cc51c706b7 | |
| parent | aea31bedcf1dcacafea00d93b23699f48b8afb06 (diff) | |
| parent | c0f83c8073cdaed7c6497b3d058822a3b27f962c (diff) | |
| download | ping-8611672f5cc76dcb655e4bc60694986a24cce4c8.tar.gz | |
Merge "Remove bionic-specific ni_* workaround now bionic is cleaned up."
| -rw-r--r-- | ping6_niquery.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/ping6_niquery.h b/ping6_niquery.h index 85dd94c..fa6624a 100644 --- a/ping6_niquery.h +++ b/ping6_niquery.h @@ -2,19 +2,6 @@ #define NI_NONCE_SIZE 8 -/* On Android, the ni_xxx macros are already provided by netinet/icmp6.h. - * Undefine them here to avoid "ni_xxx redefined" compiler warnings. GCC - * provides no way to suppress these except by completely disabling all - * preprocessor warnings. - */ -#ifdef ANDROID -#undef ni_type -#undef ni_code -#undef ni_cksum -#undef ni_qtype -#undef ni_flags -#endif - /* Node Information Query */ struct ni_hdr { struct icmp6_hdr ni_u; |