---

yaml
---
r: 49893
b: refs/heads/auto
c: b60c3bf
h: refs/heads/master
i:
  49891: 24a9f57
v: v3

Author: pcwalton

[refs]

@@ -14,5 +14,5 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 806732a70bbe5fec5121b630a957549a5ddd57e8
+refs/heads/auto: b60c3bfa4a95fecae2f28929f22f38865d7e5f79
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

branches/auto/src/libcore/libc.rs

@@ -1396,6 +1396,15 @@ pub mod funcs {
                 #[cfg(target_os = "android")]
                 #[cfg(target_os = "freebsd")]
                 unsafe fn readdir(dirp: *DIR) -> *dirent_t;
+
+                unsafe fn closedir(dirp: *DIR) -> c_int;
+                unsafe fn rewinddir(dirp: *DIR);
+                unsafe fn seekdir(dirp: *DIR, loc: c_long);
+                unsafe fn telldir(dirp: *DIR) -> c_long;
+            }
+
+            #[cfg(target_word_size = "64")]
+            pub extern {
                 // on OSX (particularly when running with a
                 // 64bit kernel), we have an issue where there
                 // are separate bindings for opendir and readdir,
@@ -1406,11 +1415,17 @@ pub mod funcs {
                 #[cfg(target_os = "macos")]
                 #[link_name = "readdir$INODE64"]
                 unsafe fn readdir(dirp: *DIR) -> *dirent_t;
-
-                unsafe fn closedir(dirp: *DIR) -> c_int;
-                unsafe fn rewinddir(dirp: *DIR);
-                unsafe fn seekdir(dirp: *DIR, loc: c_long);
-                unsafe fn telldir(dirp: *DIR) -> c_long;
+            }
+            #[cfg(target_word_size = "32")]
+            pub extern {
+                // on OSX (particularly when running with a
+                // 64bit kernel), we have an issue where there
+                // are separate bindings for opendir and readdir,
+                // which we have to explicitly link, as below.
+                #[cfg(target_os = "macos")]
+                unsafe fn opendir(dirname: *c_char) -> *DIR;
+                #[cfg(target_os = "macos")]
+                unsafe fn readdir(dirp: *DIR) -> *dirent_t;
             }
         }
 

branches/auto/src/libuv

@@ -1 +1 @@
-Subproject commit 576ab1db8ea03889eb7b2274654afe7c5c867230
+Subproject commit 218ab86721eefd7b7e97fa6d9f95a80a1fa8686c