diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index 6ee1541d6..4a11fd4c3 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -1615,6 +1615,7 @@ void lb_generate_code(lbGenerator *gen) { } if (is_foreign) { LLVMSetLinkage(g.value, LLVMExternalLinkage); + LLVMSetDLLStorageClass(g.value, LLVMDLLImportStorageClass); LLVMSetExternallyInitialized(g.value, true); lb_add_foreign_library_path(m, e->Variable.foreign_library); diff --git a/tools/odinfmt/flag/flag.odin b/tools/odinfmt/flag/flag.odin index 33c0bfe12..6b2525717 100644 --- a/tools/odinfmt/flag/flag.odin +++ b/tools/odinfmt/flag/flag.odin @@ -146,7 +146,7 @@ reflect_args_structure :: proc(ctx: ^Flag_Context, v: any) -> Flag_Error { type := types[i]; if named_type, ok := type.variant.(Type_Info_Named); ok { - if union_type, ok := named_type.base.variant.(Type_Info_Union); ok && union_type.maybe && len(union_type.variants) == 1 { + if union_type, ok := named_type.base.variant.(Type_Info_Union); ok && len(union_type.variants) == 1 { flag.optional = true; flag.tag_ptr = rawptr(uintptr(union_type.tag_offset) + uintptr(v.data) + uintptr(offsets[i])); type = union_type.variants[0]; diff --git a/tools/odinfmt/main.odin b/tools/odinfmt/main.odin index cebb20888..48e3b7212 100644 --- a/tools/odinfmt/main.odin +++ b/tools/odinfmt/main.odin @@ -70,7 +70,7 @@ walk_files :: proc(info: os.File_Info, in_err: os.Errno) -> (err: os.Errno, skip } main :: proc() { - init_global_temporary_allocator(mem.megabytes(100)); + init_global_temporary_allocator(mem.Megabyte * 100) args: Args;