mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 14:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict with identifiers matching primitives

Browse Source
This commit is contained in:
Andrew Kelley 2023-01-09 15:12:10 -07:00
parent 5766c8ebc8
commit 55be10486e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/clang_options_data.zig
View File

@ -6336,7 +6336,7 @@ joinpd1("sycl-std="),
.{ .{
.name = "undefined", .name = "undefined",
.syntax = .joined_or_separate, .syntax = .joined_or_separate,
.zig_equivalent = .undefined, .zig_equivalent = .@"undefined",
.pd1 = true, .pd1 = true,
.pd2 = false, .pd2 = false,
.psl = false, .psl = false,

4
src/main.zig
View File

@ -1661,7 +1661,7 @@ fn buildOutputType(
.install_name => { .install_name => {
install_name = it.only_arg; install_name = it.only_arg;
}, },
.undefined => { .@"undefined" => {
if (mem.eql(u8, "dynamic_lookup", it.only_arg)) { if (mem.eql(u8, "dynamic_lookup", it.only_arg)) {
linker_allow_shlib_undefined = true; linker_allow_shlib_undefined = true;
} else { } else {
@ -4730,7 +4730,7 @@ pub const ClangArgIterator = struct {
headerpad_max_install_names, headerpad_max_install_names,
compress_debug_sections, compress_debug_sections,
install_name, install_name,
undefined, @"undefined",
}; };
const Args = struct { const Args = struct {