Skip to content

Commit b7af874

Browse files
committed
Auto merge of #2642 - tamird:mreqn-all-linux, r=Amanieu
Define ip_mreqn on all Linux platforms Closes #1558.
2 parents 8bba79c + e1eeade commit b7af874

File tree

17 files changed

+7
-50
lines changed

17 files changed

+7
-50
lines changed

libc-test/semver/linux-aarch64.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ TIOCGRS485
8787
TIOCSBRK
8888
TIOCSRS485
8989
flock64
90-
ip_mreqn
9190
max_align_t
9291
mcontext_t
9392
ucontext_t

libc-test/semver/linux-i686.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ fsblkcnt64_t
211211
fsfilcnt64_t
212212
getcontext
213213
greg_t
214-
ip_mreqn
215214
makecontext
216215
max_align_t
217216
mcontext_t

libc-test/semver/linux-mips.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,5 +112,4 @@ SYS_vserver
112112
SYS_waitpid
113113
TIOCCBRK
114114
TIOCSBRK
115-
ip_mreqn
116115
max_align_t

libc-test/semver/linux-powerpc.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,5 +155,4 @@ TIOCSRS485
155155
flock64
156156
fsblkcnt64_t
157157
fsfilcnt64_t
158-
ip_mreqn
159158
sysctl

libc-test/semver/linux-powerpc64.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,5 @@ TIOCGRS485
158158
TIOCSBRK
159159
TIOCSRS485
160160
flock64
161-
ip_mreqn
162161
max_align_t
163162
sysctl

libc-test/semver/linux-powerpc64le.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,5 @@ TIOCGRS485
158158
TIOCSBRK
159159
TIOCSRS485
160160
flock64
161-
ip_mreqn
162161
max_align_t
163162
sysctl

libc-test/semver/linux-riscv64gc.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,3 @@ TIOCSRS485
6969
flock64
7070
fsblkcnt64_t
7171
fsfilcnt64_t
72-
ip_mreqn

libc-test/semver/linux-x86_64.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ TIOCGRS485
136136
TIOCSBRK
137137
TIOCSRS485
138138
greg_t
139-
ip_mreqn
140139
max_align_t
141140
mcontext_t
142141
ucontext_t

libc-test/semver/linux.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2794,6 +2794,7 @@ input_event
27942794
input_id
27952795
input_keymap_entry
27962796
input_mask
2797+
ip_mreqn
27972798
ip_mreq_source
27982799
ipc_perm
27992800
itimerspec

src/unix/linux_like/android/mod.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,6 @@ s! {
7373
pub cmsg_type: ::c_int,
7474
}
7575

76-
pub struct ip_mreqn {
77-
pub imr_multiaddr: ::in_addr,
78-
pub imr_address: ::in_addr,
79-
pub imr_ifindex: ::c_int,
80-
}
81-
8276
pub struct termios {
8377
pub c_iflag: ::tcflag_t,
8478
pub c_oflag: ::tcflag_t,

0 commit comments

Comments
 (0)