Skip to content

Commit b9c048e

Browse files
committed
---
yaml --- r: 144763 b: refs/heads/try2 c: 807408b h: refs/heads/master i: 144761: 3a3c5db 144759: 2cf9b2c v: v3
1 parent df0f369 commit b9c048e

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 0948f54e65227a95d386e429f4e1356d7dd3fba7
8+
refs/heads/try2: 807408b708a11c9a96b2dc4fedd611276273574f
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/rt/uv/uvll.rs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@ pub type sockaddr_storage = c_void;
154154
pub type socklen_t = c_int;
155155

156156
// XXX: This is a standard C type. Could probably be defined in libc
157-
#[cfg(unix)]
157+
#[cfg(target_os = "android")]
158+
#[cfg(target_os = "linux")]
158159
pub struct addrinfo {
159160
ai_flags: c_int,
160161
ai_family: c_int,
@@ -166,6 +167,19 @@ pub struct addrinfo {
166167
ai_next: *addrinfo
167168
}
168169

170+
#[cfg(target_os = "macos")]
171+
#[cfg(target_os = "freebsd")]
172+
pub struct addrinfo {
173+
ai_flags: c_int,
174+
ai_family: c_int,
175+
ai_socktype: c_int,
176+
ai_protocol: c_int,
177+
ai_addrlen: socklen_t,
178+
ai_canonname: *char,
179+
ai_addr: *sockaddr,
180+
ai_next: *addrinfo
181+
}
182+
169183
#[cfg(windows)]
170184
pub struct addrinfo {
171185
ai_flags: c_int,

0 commit comments

Comments
 (0)