--- Libc/Libc-391.1.21/include/assert.h
+++ Libc/Libc-1669.0.4/include/assert.h
@@ -50,43 +50,40 @@
  */
 
 #undef assert
-#undef __assert
 
 #ifdef NDEBUG
 #define	assert(e)	((void)0)
 #else
 
+#include <_assert.h>
+
+#ifdef __FILE_NAME__
+#define __ASSERT_FILE_NAME __FILE_NAME__
+#else /* __FILE_NAME__ */
+#define __ASSERT_FILE_NAME __FILE__
+#endif /* __FILE_NAME__ */
+
+#ifndef UNIFDEF_DRIVERKIT
 #ifndef __GNUC__
 
-__BEGIN_DECLS
-#ifndef __cplusplus
-void abort(void) __dead2;
-#endif /* !__cplusplus */
-int  printf(const char * __restrict, ...);
-__END_DECLS
-
 #define assert(e)  \
-    ((void) ((e) ? 0 : __assert (#e, __FILE__, __LINE__)))
-#define __assert(e, file, line) \
-    ((void)printf ("%s:%u: failed assertion `%s'\n", file, line, e), abort(), 0)
+    ((void) ((e) ? ((void)0) : __assert (#e, __ASSERT_FILE_NAME, __LINE__)))
 
 #else /* __GNUC__ */
 
-__BEGIN_DECLS
-void __assert_rtn(const char *, const char *, int, const char *) __dead2;
-void __eprintf(const char *, const char *, unsigned, const char *) __dead2;
-__END_DECLS
-
-#define __assert(e, file, line) \
-    (__eprintf ("%s:%u: failed assertion `%s'\n", file, line, e), 0)
-
 #if __DARWIN_UNIX03
 #define	assert(e) \
-    (__builtin_expect(!(e), 0) ? __assert_rtn(__func__, __FILE__, __LINE__, #e) : (void)0)
+    (__builtin_expect(!(e), 0) ? __assert_rtn(__func__, __ASSERT_FILE_NAME, __LINE__, #e) : (void)0)
 #else /* !__DARWIN_UNIX03 */
 #define assert(e)  \
-    ((void) (__builtin_expect(!(e), 0) ? __assert (#e, __FILE__, __LINE__) : 0))
+    (__builtin_expect(!(e), 0) ? __assert (#e, __ASSERT_FILE_NAME, __LINE__) : (void)0)
 #endif /* __DARWIN_UNIX03 */
 
 #endif /* __GNUC__ */
+#else /* UNIFDEF_DRIVERKIT */
+#define	assert(e) \
+    (__builtin_expect(!(e), 0) ? __assert_rtn(__func__, __ASSERT_FILE_NAME, __LINE__, #e) : (void)0)
+#endif /* UNIFDEF_DRIVERKIT */
 #endif /* NDEBUG */
+
+#include <_static_assert.h>