tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove <netinet/icmp6.h> ni_* macros.

Browse source 
glibc doesn't have these, and they prevent ping from building out of
the box because it assumes it can define them.

Bug: 9671560
Change-Id: I815f2a9c4fd96a0ea2952eb5a71ddf51e0763660
This commit is contained in:
Elliott Hughes 2013-07-08 15:05:50 -07:00
parent ff145277da
commit c2cd33efc4
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libc/include/netinet/icmp6.h
View file

@ -390,11 +390,15 @@ struct icmp6_nodeinfo {
/* could be followed by reply data */ /* could be followed by reply data */
} __packed; } __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_type icmp6_ni_hdr.icmp6_type
#define ni_code icmp6_ni_hdr.icmp6_code #define ni_code icmp6_ni_hdr.icmp6_code
#define ni_cksum icmp6_ni_hdr.icmp6_cksum #define ni_cksum icmp6_ni_hdr.icmp6_cksum
#define ni_qtype icmp6_ni_hdr.icmp6_data16[0] #define ni_qtype icmp6_ni_hdr.icmp6_data16[0]
#define ni_flags icmp6_ni_hdr.icmp6_data16[1] #define ni_flags icmp6_ni_hdr.icmp6_data16[1]
* END android-removed
*/
#define NI_QTYPE_NOOP 0 /* NOOP */ #define NI_QTYPE_NOOP 0 /* NOOP */
#define NI_QTYPE_SUPTYPES 1 /* Supported Qtypes */ #define NI_QTYPE_SUPTYPES 1 /* Supported Qtypes */