commit cf4c3649ade6cf2eb750c8ea50638a13d282013a
author Elliott Hughes <enh@google.com> Wed Jun 08 19:53:21 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 08 19:53:21 2016 +0000
tree 1d84f701aabf6de36bdde6a78e60e8c3eb13e024
parent 34985b60c179d17950901070cc63b597ecf3e485
parent 8cabd86c43d7da4727ba6250471b9beaafdbb424

Merge "Move /vendor/bin down with /vendor/xbin."

libc/include/assert.h

diff --git a/libc/include/assert.h b/libc/include/assert.h
index 361a5ff..0a9992d 100644
--- a/libc/include/assert.h
+++ b/libc/include/assert.h
@@ -59,7 +59,11 @@
 # endif
 #endif
 
+#if !defined(__cplusplus) && __STDC_VERSION__ >= 201112L
+#define static_assert _Static_assert
+#endif
+
 __BEGIN_DECLS
-__dead void __assert(const char *, int, const char *) __noreturn;
-__dead void __assert2(const char *, int, const char *, const char *) __noreturn;
+void __assert(const char*, int, const char*) __noreturn;
+void __assert2(const char*, int, const char*, const char*) __noreturn;
 __END_DECLS

libc/include/uchar.h

diff --git a/libc/include/uchar.h b/libc/include/uchar.h
index 9a0e2f8..6b995ab 100644
--- a/libc/include/uchar.h
+++ b/libc/include/uchar.h
@@ -34,7 +34,7 @@
 
 __BEGIN_DECLS
 
-#if __STDC_VERSION__ >= 201112L && !defined(__cplusplus)
+#if !defined(__cplusplus)
 typedef __CHAR16_TYPE__ char16_t;
 typedef __CHAR32_TYPE__ char32_t;
 #endif