X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=typescript_strings.py;h=b9eaf6abb3880e0896cbc12374040b0f393c33fe;hb=b1216b13577d42952013c14c88c1155eb6c6499f;hp=4300f1f80064d3bcba2fadf9cce07fef41f3e471;hpb=753d902bc977acbf08b3166f054673236c39c01b;p=ldk-java

diff --git a/typescript_strings.py b/typescript_strings.py
index 4300f1f8..b9eaf6ab 100644
--- a/typescript_strings.py
+++ b/typescript_strings.py
@@ -97,8 +97,7 @@ public static native long new_empty_slice_vec();
             }
 """
 
-        self.c_file_pfx = """#include <rust_types.h>
-#include "js-wasm.h"
+        self.c_file_pfx = """#include "js-wasm.h"
 #include <stdatomic.h>
 #include <lightning.h>
 
@@ -451,7 +450,7 @@ const decodeString = (stringPointer, free = true) => {
         return ""
 
     def native_c_unitary_enum_map(self, struct_name, variants, enum_doc_comment):
-        out_c = "static inline " + struct_name + " " + struct_name + "_from_js(int32_t ord) {\n"
+        out_c = "static inline LDK" + struct_name + " LDK" + struct_name + "_from_js(int32_t ord) {\n"
         out_c = out_c + "\tswitch (ord) {\n"
         ord_v = 0
 
@@ -465,7 +464,7 @@ const decodeString = (stringPointer, free = true) => {
         out_c = out_c + "\tabort();\n"
         out_c = out_c + "}\n"
 
-        out_c = out_c + "static inline int32_t " + struct_name + "_to_js(" + struct_name + " val) {\n"
+        out_c = out_c + "static inline int32_t LDK" + struct_name + "_to_js(LDK" + struct_name + " val) {\n"
         out_c = out_c + "\tswitch (val) {\n"
         ord_v = 0
         for var in variants:
@@ -934,7 +933,7 @@ const decodeString = (stringPointer, free = true) => {
 """
         return out_opaque_struct_human
 
-    def map_function(self, argument_types, c_call_string, method_name, return_type_info, struct_meth, default_constructor_args, takes_self, args_known, type_mapping_generator, doc_comment):
+    def map_function(self, argument_types, c_call_string, method_name, return_type_info, struct_meth, default_constructor_args, takes_self, takes_self_as_ref, args_known, type_mapping_generator, doc_comment):
         out_java = ""
         out_c = ""
         out_java_struct = None