about summary refs log tree commit diff
path: root/src/liblibc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-01-19 01:45:36 +0000
committerbors <bors@rust-lang.org>2015-01-19 01:45:36 +0000
commitbd8a43c668ba93d29e9671c0c8dc6b67428bf492 (patch)
treedb73d61addbeb2d0f19771706faf0e1508d512e1 /src/liblibc
parentdcaeb6aa23ecba2dc2af870668a9239136d20fa3 (diff)
parent89de6926b59136c73bf667434a53b9e05146499d (diff)
downloadrust-bd8a43c668ba93d29e9671c0c8dc6b67428bf492.tar.gz
rust-bd8a43c668ba93d29e9671c0c8dc6b67428bf492.zip
Auto merge of #21267 - danslapman:master, r=alexcrichton
This patch fixes IP_ADD_MEMBERSHIP problem described here: https://github.com/rust-lang/rust/issues/20381

I've tested on my ProbeR project, everything seems ok.
Diffstat (limited to 'src/liblibc')
-rw-r--r--src/liblibc/lib.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs
index 0ad18e25329..d010615a24c 100644
--- a/src/liblibc/lib.rs
+++ b/src/liblibc/lib.rs
@@ -2207,10 +2207,10 @@ pub mod consts {
             pub const IPPROTO_TCP: c_int = 6;
             pub const IPPROTO_IP: c_int = 0;
             pub const IPPROTO_IPV6: c_int = 41;
-            pub const IP_MULTICAST_TTL: c_int = 3;
-            pub const IP_MULTICAST_LOOP: c_int = 4;
-            pub const IP_ADD_MEMBERSHIP: c_int = 5;
-            pub const IP_DROP_MEMBERSHIP: c_int = 6;
+            pub const IP_MULTICAST_TTL: c_int = 10;
+            pub const IP_MULTICAST_LOOP: c_int = 11;
+            pub const IP_ADD_MEMBERSHIP: c_int = 12;
+            pub const IP_DROP_MEMBERSHIP: c_int = 13;
             pub const IPV6_ADD_MEMBERSHIP: c_int = 5;
             pub const IPV6_DROP_MEMBERSHIP: c_int = 6;
             pub const IP_TTL: c_int = 4;