summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorGraham Fawcett <fawcett@uwindsor.ca>2011-12-15 15:25:29 -0500
committerBrian Anderson <banderson@mozilla.com>2011-12-16 15:29:59 -0800
commit7ddd353ef693bd19b5058f89d01529407d6aa926 (patch)
treee325f66296361160773b4ac1b216d5e965f00e94 /src/libstd
parent8dc5c445cc7a37d6e0dc37ce93b763b7460adf8e (diff)
downloadrust-7ddd353ef693bd19b5058f89d01529407d6aa926.tar.gz
rust-7ddd353ef693bd19b5058f89d01529407d6aa926.zip
implement #[nolink]; deprecate #[link_name = ""]; note in stdlib to remove empty link_name.
Can't remove them from stdlib until the snapshotted compiler supports #[nolink].
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/linux_os.rs3
-rw-r--r--src/libstd/macos_os.rs5
-rw-r--r--src/libstd/win32_os.rs3
3 files changed, 7 insertions, 4 deletions
diff --git a/src/libstd/linux_os.rs b/src/libstd/linux_os.rs
index 8528057ed98..e5b13a7cfc2 100644
--- a/src/libstd/linux_os.rs
+++ b/src/libstd/linux_os.rs
@@ -24,7 +24,8 @@ export fsync_fd;
 // FIXME Somehow merge stuff duplicated here and macosx_os.rs. Made difficult
 // by https://github.com/graydon/rust/issues#issue/268
 
-#[link_name = ""]
+#[link_name = ""]               // FIXME remove after #[nolink] is snapshotted
+#[nolink]
 #[abi = "cdecl"]
 native mod libc {
     fn read(fd: fd_t, buf: *u8, count: size_t) -> ssize_t;
diff --git a/src/libstd/macos_os.rs b/src/libstd/macos_os.rs
index 72afcc234b3..37a7d0ff95f 100644
--- a/src/libstd/macos_os.rs
+++ b/src/libstd/macos_os.rs
@@ -18,7 +18,7 @@ export fsync_fd;
 // FIXME Refactor into unix_os module or some such. Doesn't
 // seem to work right now.
 
-#[link_name = ""]
+#[nolink]
 #[abi = "cdecl"]
 native mod libc {
     fn read(fd: fd_t, buf: *u8, count: size_t) -> ssize_t;
@@ -118,7 +118,8 @@ native mod rustrt {
 
 fn getcwd() -> str { ret rustrt::rust_getcwd(); }
 
-#[link_name = ""]
+#[link_name = ""]               // FIXME remove after #[nolink] is snapshotted
+#[nolink]
 #[abi = "cdecl"]
 native mod mac_libc {
     fn _NSGetExecutablePath(buf: str::sbuf,
diff --git a/src/libstd/win32_os.rs b/src/libstd/win32_os.rs
index 439a79ec7ac..825f4ffa0eb 100644
--- a/src/libstd/win32_os.rs
+++ b/src/libstd/win32_os.rs
@@ -2,7 +2,8 @@ import core::option;
 import ctypes::*;
 
 #[abi = "cdecl"]
-#[link_name = ""]
+#[link_name = ""]               // FIXME remove after #[nolink] is snapshotted
+#[nolink]
 native mod libc {
     fn read(fd: fd_t, buf: *u8, count: size_t) -> ssize_t;
     fn write(fd: fd_t, buf: *u8, count: size_t) -> ssize_t;