aboutsummaryrefslogtreecommitdiff
path: root/test/stage1/behavior
diff options
context:
space:
mode:
authorVeikka Tuominen <git@vexu.eu>2020-11-19 19:03:08 +0200
committerGitHub <noreply@github.com>2020-11-19 19:03:08 +0200
commitcf819b95fe7dec15f4ed87cd4bd8ae0be8ce7fdf (patch)
tree612ec79d1895e59d3ac50a8a2b8c0d59d34d2772 /test/stage1/behavior
parent25ec2dbc1e2302d1138749262b588d3e438fcd55 (diff)
parent3a28b659bd66a1312f5586b7fc8afdd6c6a32eb2 (diff)
downloadzig-cf819b95fe7dec15f4ed87cd4bd8ae0be8ce7fdf.tar.gz
zig-cf819b95fe7dec15f4ed87cd4bd8ae0be8ce7fdf.zip
Merge pull request #6829 from tadeokondrak/error-unsupported-callconv
stage1: Compile error instead of falling back to C for unsupported cc
Diffstat (limited to 'test/stage1/behavior')
-rw-r--r--test/stage1/behavior/fn.zig4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/stage1/behavior/fn.zig b/test/stage1/behavior/fn.zig
index c9f7477ecf..dd69d00c60 100644
--- a/test/stage1/behavior/fn.zig
+++ b/test/stage1/behavior/fn.zig
@@ -189,9 +189,9 @@ test "return inner function which references comptime variable of outer function
test "extern struct with stdcallcc fn pointer" {
const S = extern struct {
- ptr: fn () callconv(.Stdcall) i32,
+ ptr: fn () callconv(if (std.builtin.arch == .i386) .Stdcall else .C) i32,
- fn foo() callconv(.Stdcall) i32 {
+ fn foo() callconv(if (std.builtin.arch == .i386) .Stdcall else .C) i32 {
return 1234;
}
};