X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Fmain.rs;h=b72adca348e7056a5ee46500dc2ab3954f4db75b;hb=349213afe7baff6bce98dce44c5970519a5efbdb;hp=7d6a452b04a08fe34d8cf53ee1bf001e1f968865;hpb=c14513fd07359c39e2e27c2e7d475ca522f03db5;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/main.rs b/c-bindings-gen/src/main.rs
index 7d6a452..b72adca 100644
--- a/c-bindings-gen/src/main.rs
+++ b/c-bindings-gen/src/main.rs
@@ -1809,7 +1809,11 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
 
 	macro_rules! write_conv {
 		($fn_sig: expr, $to_c: expr, $ref: expr) => {
-			writeln!(w, "\t#[allow(unused)]\n\tpub(crate) fn {} {{\n\t\tmatch {} {{", $fn_sig, if $to_c { "native" } else { "self" }).unwrap();
+			writeln!(w, "\t#[allow(unused)]\n\tpub(crate) fn {} {{", $fn_sig).unwrap();
+			if $to_c && $ref {
+				writeln!(w, "\t\tlet native = unsafe {{ &*(native as *const _ as *const c_void as *const native{}) }};", e.ident).unwrap();
+			}
+			writeln!(w, "\t\tmatch {} {{", if $to_c { "native" } else { "self" }).unwrap();
 			for var in e.variants.iter() {
 				write!(w, "\t\t\t{}{}::{} ", if $to_c { "native" } else { "" }, e.ident, var.ident).unwrap();
 				let mut empty_tuple_variant = false;
@@ -1933,7 +1937,10 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
 	}
 	write_conv!(format!("into_native(self) -> native{}", e.ident), false, false);
 	if is_clonable {
-		write_conv!(format!("from_native(native: &native{}) -> Self", e.ident), true, true);
+		let mut args = Vec::new();
+		maybe_write_non_lifetime_generics(&mut args, &e.generics, &syn::PathArguments::None, &types);
+		let fn_line = format!("from_native(native: &{}Import{}) -> Self", e.ident, String::from_utf8(args).unwrap());
+		write_conv!(fn_line, true, true);
 	}
 	write_conv!(format!("native_into(native: native{}) -> Self", e.ident), true, false);
 	writeln!(w, "}}").unwrap();