about summary refs log tree commit diff
path: root/src/liblibc
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-01-06 09:24:46 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-01-06 15:24:24 -0800
commite2f97f51ad4cf902e5a5835b5332447fe59089c4 (patch)
tree6158174fbd2ae40d72c113d398ff192a936804f7 /src/liblibc
parent5c3ddcb15dc8b40fa780a38fd7494b9b5b991d09 (diff)
Register new snapshots
Conflicts:
	src/librbml/lib.rs
	src/libserialize/json_stage0.rs
	src/libserialize/serialize_stage0.rs
	src/libsyntax/ast.rs
	src/libsyntax/ext/deriving/generic/mod.rs
	src/libsyntax/parse/token.rs
Diffstat (limited to 'src/liblibc')
-rw-r--r--src/liblibc/lib.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs
index e3f02146a75..1aaa0528a68 100644
--- a/src/liblibc/lib.rs
+++ b/src/liblibc/lib.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(globs)]
 #![crate_name = "libc"]
 #![experimental]
 #![no_std] // we don't need std, and we can't have std, since it doesn't exist
@@ -76,7 +75,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(missing_docs)]
 #![allow(non_snake_case)]
-#![allow(raw_pointer_deriving)]
+#![allow(raw_pointer_derive)]
 
 extern crate core;