Merge branch 'assert_fail' into 'master'

Rename __assert to __assert_fail

See merge request redox-os/relibc!212

include/bits/assert.h

@@ -5,7 +5,7 @@
 # define assert(cond) (void) 0
 #else
 # define assert(cond) \
-  ((void)((cond) || (__assert(__func__, __FILE__, __LINE__, #cond), 0)))
+  ((void)((cond) || (__assert_fail(__func__, __FILE__, __LINE__, #cond), 0)))
 #endif
 
 #endif

src/header/assert/mod.rs

@@ -6,7 +6,7 @@ use header::{stdio, stdlib};
 use platform::types::*;
 
 #[no_mangle]
-pub unsafe extern "C" fn __assert(
+pub unsafe extern "C" fn __assert_fail(
     func: *const c_char,
     file: *const c_char,
     line: c_int,