Changeset dc5c303 in mainline for abi

Timestamp:

2023-12-28T13:59:23Z (22 months ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

Location:

abi/include

Files:

• _bits/decls.h (modified) (1 diff)
• _bits/uchar.h (modified) (1 diff)
• abi/sysinfo.h (modified) (1 diff)

abi/include/_bits/decls.h

@@ -61 +61 @@
 #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
 

abi/include/_bits/uchar.h

@@ -38 +38 @@
 #include <stdint.h>
 
+/*
+ * char8_t became part of C++ with C++20.
+ * It is part of C23 hence we define it for C compilations only.
+ */
+#ifndef __cplusplus
 typedef uint8_t char8_t;
+#endif
+
 typedef uint32_t char32_t;
 

abi/include/abi/sysinfo.h

@@ -37 +37 @@
 #define _ABI_SYSINFO_H_
 
+#include <_bits/size_t.h>
 #include <stdbool.h>
 #include <abi/proc/task.h>