auto merge of #12078 : colemickens/rust/patch-2, r=alexcrichton

bors · bors · commit 55f53f553a04 · 2014-02-06T22:31:33.000-08:00
diff --git a/src/doc/guide-ffi.md b/src/doc/guide-ffi.md
@@ -520,7 +520,7 @@ conventions. Rust provides a way to tell the compiler which convention to use:
 
 ~~~~
 #[cfg(target_os = "win32", target_arch = "x86")]
-#[link_name = "kernel32"]
+#[link(name = "kernel32")]
 extern "stdcall" {
     fn SetEnvironmentVariableA(n: *u8, v: *u8) -> std::libc::c_int;
 }

Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ conventions. Rust provides a way to tell the compiler which convention to use:`
`520`	`520`
`521`	`521`	`~~~~`
`522`	`522`	`#[cfg(target_os = "win32", target_arch = "x86")]`
`523`		`-#[link_name = "kernel32"]`
	`523`	`+#[link(name = "kernel32")]`
`524`	`524`	`extern "stdcall" {`
`525`	`525`	`fn SetEnvironmentVariableA(n: u8, v: u8) -> std::libc::c_int;`
`526`	`526`	`}`