Skip to content

Commit 0e1bdb7

Browse files
authored
Merge pull request #245 from jrozner/bugfix/windows-bitshift
Add pack pragma for struct padding back
2 parents 4cb53df + c8b0b53 commit 0e1bdb7

15 files changed

+17062
-72997
lines changed

Cargo.lock

Lines changed: 11 additions & 142 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cryptoki-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ documentation = "https://docs.rs/crate/cryptoki-sys"
1313
rust-version = "1.66.0"
1414

1515
[build-dependencies]
16-
bindgen = { version = "0.69.4", optional = true }
16+
bindgen = { version = "0.70.1", optional = true }
1717

1818
[dependencies]
1919
libloading = "0.7.0"

cryptoki-sys/build.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,10 @@ mod generate {
103103
.derive_debug(true)
104104
// Derive the `Default` trait for the generated structs where possible.
105105
.derive_default(true)
106-
.parse_callbacks(Box::new(CargoCallbacks));
106+
.parse_callbacks(Box::new(CargoCallbacks))
107+
// Support function like macros
108+
// https://github.com/parallaxsecond/rust-cryptoki/issues/240
109+
.clang_macro_fallback();
107110

108111
let bindings = builder.generate().expect("Unable to generate bindings");
109112

0 commit comments

Comments
 (0)