Skip to content

Commit bcd2800

Browse files
committed
Fix merge conflict
Self note: never use github conflict resolver again
1 parent 6e8b3bd commit bcd2800

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Diff for: src/arduino.cc/builder/ctags_runner.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,9 @@ func (s *CTagsRunner) Run(ctx *types.Context) error {
7474
ctx.CTagsOutput = string(sourceBytes)
7575

7676
parser := &ctags.CTagsParser{}
77-
ctx.CTagsOfPreprocessedSource = parser.Parse(ctx.CTagsOutput)
7877

79-
parser.FixCLinkageTagsDeclarations(ctx.CTagsOfPreprocessedSource)
8078
ctx.CTagsOfPreprocessedSource = parser.Parse(ctx.CTagsOutput, ctx.Sketch.MainFile.Name)
79+
parser.FixCLinkageTagsDeclarations(ctx.CTagsOfPreprocessedSource)
8180

8281
protos, line := parser.GeneratePrototypes()
8382
if line != -1 {

0 commit comments

Comments
 (0)