Commit 55be10486e

Andrew Kelley <andrew@ziglang.org>
2023-01-09 23:12:10
fix merge conflict with identifiers matching primitives
1 parent 5766c8e
Changed files (2)
src
clang_options_data.zig
main.zig
src/clang_options_data.zig
@@ -6336,7 +6336,7 @@ joinpd1("sycl-std="),
 .{
     .name = "undefined",
     .syntax = .joined_or_separate,
-    .zig_equivalent = .undefined,
+    .zig_equivalent = .@"undefined",
     .pd1 = true,
     .pd2 = false,
     .psl = false,
src/main.zig
@@ -1661,7 +1661,7 @@ fn buildOutputType(
                     .install_name => {
                         install_name = it.only_arg;
                     },
-                    .undefined => {
+                    .@"undefined" => {
                         if (mem.eql(u8, "dynamic_lookup", it.only_arg)) {
                             linker_allow_shlib_undefined = true;
                         } else {
@@ -4730,7 +4730,7 @@ pub const ClangArgIterator = struct {
         headerpad_max_install_names,
         compress_debug_sections,
         install_name,
-        undefined,
+        @"undefined",
     };
 
     const Args = struct {