about summary refs log tree commit diff
path: root/src/liblibc/lib.rs
diff options
context:
space:
mode:
authorTom Lee <github@tomlee.co>2014-05-12 21:48:02 -0700
committerTom Lee <github@tomlee.co>2014-05-12 21:48:02 -0700
commit218d01ef3321c40b091e3b77823f8bd857e87b93 (patch)
tree1d06dd5f6ad84ac73d133d6b63a382ec45198022 /src/liblibc/lib.rs
parent8252353916998ef43596ad62b27dd396afdd5de0 (diff)
downloadrust-218d01ef3321c40b091e3b77823f8bd857e87b93.tar.gz
rust-218d01ef3321c40b091e3b77823f8bd857e87b93.zip
Fix field ordering of addrinfo struct on Android
Diffstat (limited to 'src/liblibc/lib.rs')
-rw-r--r--src/liblibc/lib.rs11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs
index 7258569e433..5d96ccf2b65 100644
--- a/src/liblibc/lib.rs
+++ b/src/liblibc/lib.rs
@@ -430,8 +430,19 @@ pub mod types {
                     pub ai_socktype: c_int,
                     pub ai_protocol: c_int,
                     pub ai_addrlen: socklen_t,
+
+                    #[cfg(target_os = "linux")]
                     pub ai_addr: *sockaddr,
+
+                    #[cfg(target_os = "linux")]
+                    pub ai_canonname: *c_char,
+
+                    #[cfg(target_os = "android")]
                     pub ai_canonname: *c_char,
+
+                    #[cfg(target_os = "android")]
+                    pub ai_addr: *sockaddr,
+
                     pub ai_next: *addrinfo,
                 }
                 pub struct sockaddr_un {