diff options
| author | Neal H. Walfield <neal@pep.foundation> | 2019-05-13 10:54:12 +0200 |
|---|---|---|
| committer | Neal H. Walfield <neal@pep.foundation> | 2019-05-13 10:54:12 +0200 |
| commit | 25c309102d81d62a1db439aae4fa7d45a155df6b (patch) | |
| tree | a1f106e751c32c8ee6553ae9327fbd1edf0b59ec | |
| parent | e363549906b457bb829d51593c6da7b0767abc8f (diff) | |
openpgp-ffi: Use the C ABI, not the system ABI
Reported-by: Thomas Muenz
| -rw-r--r-- | ffi-macros/src/lib.rs | 2 | ||||
| -rw-r--r-- | openpgp-ffi/src/parse/stream.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ffi-macros/src/lib.rs b/ffi-macros/src/lib.rs index 3620549d..e28c0c85 100644 --- a/ffi-macros/src/lib.rs +++ b/ffi-macros/src/lib.rs @@ -927,7 +927,7 @@ fn derive_iterator(span: proc_macro2::Span, prefix: &str, name: &str, quote! { /// Gets the next item from the iterator. - #[::sequoia_ffi_macros::extern_fn] #[no_mangle] pub extern "system" + #[::sequoia_ffi_macros::extern_fn] #[no_mangle] pub extern "C" fn #ident #generics (this: *mut #wrapper #generics) -> Option<::std::ptr::NonNull<#item_type>> { use ::RefMutRaw; diff --git a/openpgp-ffi/src/parse/stream.rs b/openpgp-ffi/src/parse/stream.rs index 8dcaf101..5b8ed62b 100644 --- a/openpgp-ffi/src/parse/stream.rs +++ b/openpgp-ffi/src/parse/stream.rs @@ -56,7 +56,7 @@ use super::super::{ pub struct MessageStructure<'a>(stream::MessageStructure<'a>); /// Iterates over the message structure. -#[::sequoia_ffi_macros::extern_fn] #[no_mangle] pub extern "system" +#[::sequoia_ffi_macros::extern_fn] #[no_mangle] pub extern "C" fn pgp_message_structure_iter(structure: *const MessageStructure) -> *mut MessageStructureIter { structure.ref_raw().iter().move_into_raw() |