Auto merge of #478 - jackpot51:patch-1, r=alexcrichton

bors · bors · commit e49e9bb7c3d9 · 2016-12-21T16:38:10.000Z
Add memalign to Redox (for use in allocator) This is required to satisfy a review item here: rust-lang/rust#38401
diff --git a/src/redox.rs b/src/redox.rs
@@ -47,3 +47,7 @@ s! {
         pub sin6_scope_id: u32,
     }
 }
+
+extern {
+    pub fn memalign(align: ::size_t, size: ::size_t) -> *mut ::c_void;
+}

Original file line number	Diff line number	Diff line change
`@@ -47,3 +47,7 @@ s! {`
`47`	`47`	`pub sin6_scope_id: u32,`
`48`	`48`	`}`
`49`	`49`	`}`
	`50`	`+`
	`51`	`+extern {`
	`52`	`+ pub fn memalign(align: ::size_t, size: ::size_t) -> *mut ::c_void;`
	`53`	`+}`