Skip to content

Use C++ fixed-type enumeration syntax under C23 (or higher) as well #1156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
garrison wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Use C++ fixed-type enumeration syntax under C23 (or higher) as well #1156

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
913df52
Use C++ fixed-type enumeration syntax under C23 (or higher) as well
garrison Mar 30, 2026
172da53
Fix typo
garrison Apr 29, 2026
8b8a203
Fix correctness and update tests
garrison Apr 29, 2026
6d6f2ad
Apply suggestion from @garrison
garrison Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/bindgen/ir/enumeration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,11 +682,11 @@ impl Enum {

if config.cpp_compatible_c() {
out.new_line();
out.write("#ifdef __cplusplus");
out.write("#if defined(__cplusplus) || __STDC_VERSION__ >= 202311L");
out.new_line();
write!(out, " : {prim}");
out.new_line();
out.write("#endif // __cplusplus");
out.write("#endif // defined(__cplusplus) || __STDC_VERSION__ >= 202311L");
out.new_line();
}
} else {
Expand Down Expand Up @@ -759,12 +759,12 @@ impl Enum {
}

// Emit typedef specifying the tag enum's size if necessary.
// In C++ enums can "inherit" from numeric types (`enum E: uint8_t { ... }`),
// but in C `typedef uint8_t E` is the only way to give a fixed size to `E`.
// In C++ or C23 enums can "inherit" from numeric types (`enum E: uint8_t { ... }`),
// but in olders versions of C `typedef uint8_t E` is the only way to give a fixed size to `E`.
if let Some(prim) = size {
if config.cpp_compatible_c() {
out.new_line_if_not_start();
out.write("#ifndef __cplusplus");
out.write("#if !defined(__cplusplus) && __STDC_VERSION__ < 202311L");
}

if config.language != Language::Cxx {
Expand All @@ -774,7 +774,7 @@ impl Enum {

if config.cpp_compatible_c() {
out.new_line_if_not_start();
out.write("#endif // __cplusplus");
out.write("#endif // !defined(__cplusplus) && __STDC_VERSION__ < 202311L");
}
}

Expand Down
Loading