aboutsummaryrefslogtreecommitdiff
path: root/lib/std
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2020-02-18 18:45:25 -0500
committerAndrew Kelley <andrew@ziglang.org>2020-02-18 18:45:25 -0500
commitcbc4e59e6805d27f0e889c0a9ff8488376cea5c0 (patch)
tree0f5ca27a04c354639a61c65c6acb7e867fb0c5bf /lib/std
parentccca4b5a5e98dd96aaeb365af6c1cfbe87dca181 (diff)
parent30194f27fb5521b11442f1d13474eac3915051d7 (diff)
downloadzig-cbc4e59e6805d27f0e889c0a9ff8488376cea5c0.tar.gz
zig-cbc4e59e6805d27f0e889c0a9ff8488376cea5c0.zip
Merge branch 'LemonBoy-c8c8c8c8'
closes #4502
Diffstat (limited to 'lib/std')
-rw-r--r--lib/std/zig/parser_test.zig2
-rw-r--r--lib/std/zig/render.zig1
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/std/zig/parser_test.zig b/lib/std/zig/parser_test.zig
index 28bf0c9ed5..5f28dd3b06 100644
--- a/lib/std/zig/parser_test.zig
+++ b/lib/std/zig/parser_test.zig
@@ -92,10 +92,12 @@ test "zig fmt: convert extern/nakedcc/stdcallcc into callconv(...)" {
\\nakedcc fn foo1() void {}
\\stdcallcc fn foo2() void {}
\\extern fn foo3() void {}
+ \\extern "mylib" fn foo4() void {}
,
\\fn foo1() callconv(.Naked) void {}
\\fn foo2() callconv(.Stdcall) void {}
\\fn foo3() callconv(.C) void {}
+ \\fn foo4() callconv(.C) void {}
\\
);
}
diff --git a/lib/std/zig/render.zig b/lib/std/zig/render.zig
index e322a91dc4..069635d42e 100644
--- a/lib/std/zig/render.zig
+++ b/lib/std/zig/render.zig
@@ -1396,6 +1396,7 @@ fn renderExpression(
try renderToken(tree, stream, extern_export_inline_token, indent, start_col, Space.Space); // extern/export
} else {
cc_rewrite_str = ".C";
+ fn_proto.lib_name = null;
}
}