---

yaml
---
r: 107207
b: refs/heads/try
c: 8959ade
h: refs/heads/master
i:
  107205: 3ad2f35
  107203: 5575787
  107199: bbb59ef
v: v3

Author: emberian

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: b8ef9fd9c9f642ce7b8aed82782a1ed745d08d64
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b8601a3d8b91ad3b653d143307611f2f5c75617e
-refs/heads/try: ca406fa64643e68adcb47b509b3152b99ccab72b
+refs/heads/try: 8959aded2c5158792f03474d33f13e44266e4db7
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/liblibc/lib.rs

@@ -3663,18 +3663,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;
             }
 
@@ -4271,4 +4265,4 @@ pub mod funcs {
     }
 }
 
-#[test] fn work_on_windows() { } // this is needed to make rustc happy on windows
+#[test] fn work_on_windows() { } // FIXME #10872 needed for a happy windows