From: Matt Corallo Date: Mon, 10 Jan 2022 01:16:27 +0000 (+0000) Subject: Use uintptr_t for the return value of `clone_ptr` to match reality X-Git-Tag: v0.0.104.1^2~20 X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=95b189a4e89c9391fbb1197b176a1c20857e8042;p=ldk-java Use uintptr_t for the return value of `clone_ptr` to match reality --- diff --git a/genbindings.py b/genbindings.py index 1ac132ad..c5bc0b1f 100755 --- a/genbindings.py +++ b/genbindings.py @@ -431,13 +431,13 @@ with open(sys.argv[1]) as in_h, open(f"{sys.argv[2]}/bindings{consts.file_ext}", return_type_info = type_mapping_generator.map_type(method_return_type.strip() + " ret", True, ret_arr_len, False, force_holds_ref) if method_name.endswith("_clone") and expected_struct not in unitary_enums: - meth_line = "uint64_t " + expected_struct.replace("LDK", "") + "_clone_ptr(" + expected_struct + " *NONNULL_PTR arg)" + meth_line = "uintptr_t " + expected_struct.replace("LDK", "") + "_clone_ptr(" + expected_struct + " *NONNULL_PTR arg)" write_c("static inline " + meth_line + " {\n") write_c("\t" + return_type_info.ret_conv[0].replace("\n", "\n\t")) write_c(method_name + "(arg)") write_c(return_type_info.ret_conv[1]) write_c("\n\treturn " + return_type_info.ret_conv_name + ";\n}\n") - map_fn(meth_line + ";\n", re.compile("(uint64_t) ([A-Za-z_0-9]*)\((.*)\)").match(meth_line), None, None, None) + map_fn(meth_line + ";\n", re.compile("(uintptr_t) ([A-Za-z_0-9]*)\((.*)\)").match(meth_line), None, None, None) argument_types = [] default_constructor_args = {}