vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

ci: fix msvc compilation of interface code

pull/10479/head
Delyan Angelov 2021-06-16 12:15:16 +03:00
parent 69ce8baefd
commit e518cdbe7f
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vlib/v/gen/c/cgen.v
View File

@ -6549,7 +6549,9 @@ fn (mut g Gen) interface_table() string {
} else { } else {
// the field is embedded in another struct // the field is embedded in another struct
cast_struct.write_string('\t\t.$cname = ($field_styp*)((char*)x') cast_struct.write_string('\t\t.$cname = ($field_styp*)((char*)x')
if st != ast.voidptr_type { if st == ast.voidptr_type {
cast_struct.write_string('/*.... ast.voidptr_type */')
} else {
for embed_type in st_sym.struct_info().embeds { for embed_type in st_sym.struct_info().embeds {
embed_sym := g.table.get_type_symbol(embed_type) embed_sym := g.table.get_type_symbol(embed_type)
if _ := embed_sym.find_field(field.name) { if _ := embed_sym.find_field(field.name) {
@ -6574,6 +6576,13 @@ static inline $interface_name I_${cctype}_to_Interface_${interface_name}($cctype
if g.pref.build_mode != .build_module { if g.pref.build_mode != .build_module {
methods_struct.writeln('\t{') methods_struct.writeln('\t{')
} }
if st == ast.voidptr_type {
for mname, _ in methodidx {
if g.pref.build_mode != .build_module {
methods_struct.writeln('\t\t._method_${c_name(mname)} = (void*) 0,')
}
}
}
for _, method in st_sym.methods { for _, method in st_sym.methods {
if method.name !in methodidx { if method.name !in methodidx {
// a method that is not part of the interface should be just skipped // a method that is not part of the interface should be just skipped