diff options
| author | Andrew Cann <shum@canndrew.org> | 2018-05-31 13:53:10 +0800 |
|---|---|---|
| committer | Andrew Cann <shum@canndrew.org> | 2018-05-31 13:53:10 +0800 |
| commit | e4a50811dd73b582a0dda665d1866b08a0e438fb (patch) | |
| tree | 834935d035e2bfab1145eba7b6fc00335546ffd2 | |
| parent | 8dd5125f1edbf82eb2bd94e651acc19a9b1e731a (diff) | |
| download | rust-libc-e4a50811dd73b582a0dda665d1866b08a0e438fb.tar.gz | |
remove conflicting linux/ip.h header
| -rw-r--r-- | libc-test/build.rs | 1 | ||||
| -rw-r--r-- | src/unix/notbsd/mod.rs | 35 |
2 files changed, 0 insertions, 36 deletions
diff --git a/libc-test/build.rs b/libc-test/build.rs index 5694a60d61..327b9206b4 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -229,7 +229,6 @@ fn main() { if linux || android || emscripten { cfg.header("malloc.h"); cfg.header("net/ethernet.h"); - cfg.header("net/ip.h"); cfg.header("netpacket/packet.h"); cfg.header("sched.h"); cfg.header("sys/epoll.h"); diff --git a/src/unix/notbsd/mod.rs b/src/unix/notbsd/mod.rs index 37bc99f19f..31a520d05b 100644 --- a/src/unix/notbsd/mod.rs +++ b/src/unix/notbsd/mod.rs @@ -854,7 +854,6 @@ pub const IPOPT_NOOP: u8 = (1 |IPOPT_CONTROL); pub const IPOPT_SEC: u8 = (2 |IPOPT_CONTROL|IPOPT_COPY); pub const IPOPT_LSRR: u8 = (3 |IPOPT_CONTROL|IPOPT_COPY); pub const IPOPT_TIMESTAMP: u8 = (4 |IPOPT_MEASUREMENT); -pub const IPOPT_CIPSO: u8 = (6 |IPOPT_CONTROL|IPOPT_COPY); pub const IPOPT_RR: u8 = (7 |IPOPT_CONTROL); pub const IPOPT_SID: u8 = (8 |IPOPT_CONTROL|IPOPT_COPY); pub const IPOPT_SSRR: u8 = (9 |IPOPT_CONTROL|IPOPT_COPY); @@ -873,40 +872,6 @@ pub const IPOPT_TS: u8 = IPOPT_TIMESTAMP; pub const IPOPT_TS_TSONLY: u8 = 0; pub const IPOPT_TS_TSANDADDR: u8 = 1; pub const IPOPT_TS_PRESPEC: u8 = 3; -pub const IPV4_BEET_PHMAXLEN: u8 = 8; - -pub const IPV4_DEVCONF_FORWARDING: ::c_int = 1; -pub const IPV4_DEVCONF_MC_FORWARDING: ::c_int = 2; -pub const IPV4_DEVCONF_PROXY_ARP: ::c_int = 3; -pub const IPV4_DEVCONF_ACCEPT_REDIRECTS: ::c_int = 4; -pub const IPV4_DEVCONF_SECURE_REDIRECTS: ::c_int = 5; -pub const IPV4_DEVCONF_SEND_REDIRECTS: ::c_int = 6; -pub const IPV4_DEVCONF_SHARED_MEDIA: ::c_int = 7; -pub const IPV4_DEVCONF_RP_FILTER: ::c_int = 8; -pub const IPV4_DEVCONF_ACCEPT_SOURCE_ROUTE: ::c_int = 9; -pub const IPV4_DEVCONF_BOOTP_RELAY: ::c_int = 10; -pub const IPV4_DEVCONF_LOG_MARTIANS: ::c_int = 11; -pub const IPV4_DEVCONF_TAG: ::c_int = 12; -pub const IPV4_DEVCONF_ARPFILTER: ::c_int = 13; -pub const IPV4_DEVCONF_MEDIUM_ID: ::c_int = 14; -pub const IPV4_DEVCONF_NOXFRM: ::c_int = 15; -pub const IPV4_DEVCONF_NOPOLICY: ::c_int = 16; -pub const IPV4_DEVCONF_FORCE_IGMP_VERSION: ::c_int = 17; -pub const IPV4_DEVCONF_ARP_ANNOUNCE: ::c_int = 18; -pub const IPV4_DEVCONF_ARP_IGNORE: ::c_int = 19; -pub const IPV4_DEVCONF_PROMOTE_SECONDARIES: ::c_int = 20; -pub const IPV4_DEVCONF_ARP_ACCEPT: ::c_int = 21; -pub const IPV4_DEVCONF_ARP_NOTIFY: ::c_int = 22; -pub const IPV4_DEVCONF_ACCEPT_LOCAL: ::c_int = 23; -pub const IPV4_DEVCONF_SRC_VMARK: ::c_int = 24; -pub const IPV4_DEVCONF_PROXY_ARP_PVLAN: ::c_int = 25; -pub const IPV4_DEVCONF_ROUTE_LOCALNET: ::c_int = 26; -pub const IPV4_DEVCONF_IGMPV2_UNSOLICITED_REPORT_INTERVAL: ::c_int = 27; -pub const IPV4_DEVCONF_IGMPV3_UNSOLICITED_REPORT_INTERVAL: ::c_int = 28; -pub const IPV4_DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN: ::c_int = 29; -pub const IPV4_DEVCONF_DROP_UNICAST_IN_L2_MULTICAST: ::c_int = 30; -pub const IPV4_DEVCONF_DROP_GRATUITOUS_ARP: ::c_int = 31; -pub const __IPV4_DEVCONF_MAX: ::c_int = 32; f! { pub fn FD_CLR(fd: ::c_int, set: *mut fd_set) -> () { |