Index: abi/include/_bits/decls.h
===================================================================
--- abi/include/_bits/decls.h	(revision dcef1127074a0bc848a38cc3831924924320c130)
+++ abi/include/_bits/decls.h	(revision dc0f6e4c8e25531a81515e002eb3011aa8098c45)
@@ -61,4 +61,14 @@
 #endif  /* __cplusplus */
 
+/*
+ * __CONSTEXPR for headers shared by C and C++. Headers that are purely for
+ * C++ sources should use constexpr directly.
+ */
+#ifdef __cplusplus
+#define __CONSTEXPR constexpr
+#else
+#define __CONSTEXPR
+#endif
+
 #endif