---

yaml
---
r: 110711
b: refs/heads/try
c: 06ad5eb
h: refs/heads/master
i:
  110709: 98e0922
  110707: 6232c46
  110703: b0144f2
v: v3

Author: emberian

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 65abf96fb6630d7ddbcdc3b39f599c02ecfc2f1e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: e263ef1df7b892ed29e53313565eb05ab75e52f4
-refs/heads/try: 308c03501a9a49d058f2ad76dd17a4e593ce7be7
+refs/heads/try: 06ad5eb459f1072d79a815210d69af55ef174d20
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/liblibc/lib.rs

@@ -3695,18 +3695,12 @@ pub mod funcs {
             // opendir$INODE64, etc. but for some reason rustc
             // doesn't link it correctly on i686, so we're going
             // through a C function that mysteriously does work.
-            pub unsafe fn opendir(dirname: *c_char) -> *DIR {
-                rust_opendir(dirname)
-            }
-            pub unsafe fn readdir_r(dirp: *DIR,
-                                    entry: *mut dirent_t,
-                                    result: *mut *mut dirent_t) -> c_int {
-                rust_readdir_r(dirp, entry, result)
-            }
 
             extern {
-                fn rust_opendir(dirname: *c_char) -> *DIR;
-                fn rust_readdir_r(dirp: *DIR, entry: *mut dirent_t,
+                #[link_name="rust_opendir"]
+                pub fn opendir(dirname: *c_char) -> *DIR;
+                #[link_name="rust_readdir_r"]
+                pub fn readdir_r(dirp: *DIR, entry: *mut dirent_t,
                                   result: *mut *mut dirent_t) -> c_int;
             }
 
@@ -4321,3 +4315,5 @@ pub mod funcs {
         }
     }
 }
+
+#[test] fn work_on_windows() { } // FIXME #10872 needed for a happy windows