New upstream version 1.26.0+dfsg1

[rustc.git] / src / vendor / libc / src / lib.rs

diff --git a/src/vendor/libc/src/lib.rs b/src/vendor/libc/src/lib.rs
index b58a873eac93fab35da1361b0ec62fc495d3c206..255548066518578eef61a4cf0f050e80b567b0d7 100644 (file)
--- a/src/vendor/libc/src/lib.rs
+++ b/src/vendor/libc/src/lib.rs
@@ -13,8 +13,8 @@
 #![allow(bad_style, overflowing_literals, improper_ctypes)]
 #![crate_type = "rlib"]
 #![crate_name = "libc"]
-#![cfg_attr(dox, feature(no_core, lang_items))]
-#![cfg_attr(dox, no_core)]
+#![cfg_attr(cross_platform_docs, feature(no_core, lang_items))]
+#![cfg_attr(cross_platform_docs, no_core)]
 #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "https://doc.rust-lang.org/favicon.ico")]
 
@@ -72,13 +72,16 @@
 #![cfg_attr(target_os = "dragonfly", doc(
     html_root_url = "https://doc.rust-lang.org/libc/x86_64-unknown-dragonfly"
 ))]
+#![cfg_attr(target_os = "solaris", doc(
+    html_root_url = "https://doc.rust-lang.org/libc/x86_64-sun-solaris"
+))]
 #![cfg_attr(all(target_os = "emscripten", target_arch = "asmjs"), doc(
     html_root_url = "https://doc.rust-lang.org/libc/asmjs-unknown-emscripten"
 ))]
 #![cfg_attr(all(target_os = "emscripten", target_arch = "wasm32"), doc(
     html_root_url = "https://doc.rust-lang.org/libc/wasm32-unknown-emscripten"
 ))]
-#![cfg_attr(all(target_os = "linux", target_arch = "xparc64"), doc(
+#![cfg_attr(all(target_os = "linux", target_arch = "sparc64"), doc(
     html_root_url = "https://doc.rust-lang.org/libc/sparc64-unknown-linux-gnu"
 ))]
 
@@ -94,7 +97,7 @@
 
 #![cfg_attr(not(feature = "use_std"), no_std)]
 
-#[cfg(all(not(dox), feature = "use_std"))]
+#[cfg(all(not(cross_platform_docs), feature = "use_std"))]
 extern crate std as core;
 
 #[macro_use] mod macros;