authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-09 15:12:10-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-09 15:12:10-07:00
log55be10486ef6aad1f497fb0ab85ac36043b79652
tree9d2efe301dbfa14a43608a8adbc87d5027eb8e70
parent5766c8ebc8c1ebf32383bb338328154035f0f4d7

fix merge conflict with identifiers matching primitives

2 files changed, 3 insertions(+), 3 deletions(-)

src/clang_options_data.zig+1-1
......@@ -6336,7 +6336,7 @@ joinpd1("sycl-std="),
63366336.{
63376337 .name = "undefined",
63386338 .syntax = .joined_or_separate,
6339 .zig_equivalent = .undefined,
6339 .zig_equivalent = .@"undefined",
63406340 .pd1 = true,
63416341 .pd2 = false,
63426342 .psl = false,
src/main.zig+2-2
......@@ -1661,7 +1661,7 @@ fn buildOutputType(
16611661 .install_name => {
16621662 install_name = it.only_arg;
16631663 },
1664 .undefined => {
1664 .@"undefined" => {
16651665 if (mem.eql(u8, "dynamic_lookup", it.only_arg)) {
16661666 linker_allow_shlib_undefined = true;
16671667 } else {
......@@ -4730,7 +4730,7 @@ pub const ClangArgIterator = struct {
47304730 headerpad_max_install_names,
47314731 compress_debug_sections,
47324732 install_name,
4733 undefined,
4733 @"undefined",
47344734 };
47354735
47364736 const Args = struct {