am 4fc8a0c1: Merge "Remove <netinet/icmp6.h> ni_* macros."

* commit '4fc8a0c1165537b693c900ac3e2c61470bd7e484':
  Remove <netinet/icmp6.h> ni_* macros.
This commit is contained in:
Elliott Hughes 2013-07-08 15:09:07 -07:00 committed by Android Git Automerger
commit f3f72e7f27

View file

@ -390,11 +390,15 @@ struct icmp6_nodeinfo {
/* could be followed by reply data */
} __packed;
/*
* BEGIN android-removed: glibc doesn't have these, and external/ping declares them itself.
#define ni_type icmp6_ni_hdr.icmp6_type
#define ni_code icmp6_ni_hdr.icmp6_code
#define ni_cksum icmp6_ni_hdr.icmp6_cksum
#define ni_qtype icmp6_ni_hdr.icmp6_data16[0]
#define ni_flags icmp6_ni_hdr.icmp6_data16[1]
* END android-removed
*/
#define NI_QTYPE_NOOP 0 /* NOOP */
#define NI_QTYPE_SUPTYPES 1 /* Supported Qtypes */