Page MenuHomePhabricator

[lldb-vscode] correctly use Windows macros
ClosedPublic

Authored by wallace on Feb 4 2021, 10:09 AM.

Details

Summary

@mstorsjo found a mistake that I made when trying to fix some Windows
compilation errors encountered by @stella.stamenova.

I was incorrectly using the LLVM_ON_UNIX macro. In any case, proper use
of

#if defined(_WIN32)

should be the actual fix.

Diff Detail

Event Timeline

wallace requested review of this revision.Feb 4 2021, 10:09 AM
wallace created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptFeb 4 2021, 10:09 AM
lanza accepted this revision.Feb 4 2021, 10:57 AM
lanza added a subscriber: lanza.

LGTM, I had to do this to fix it locally and can confirm it works.

This revision is now accepted and ready to land.Feb 4 2021, 10:57 AM
This revision was landed with ongoing or failed builds.Feb 4 2021, 11:03 AM
This revision was automatically updated to reflect the committed changes.

The change looks ok to me. In my environments, the main branch does build correctly, but this should be good for consistency in any case. (The 12.x release branch does need a cherrypick though - but it'd be good to settle this first.)

I can test build it in a couple hours, I'll mark it as formally approved after doing that.

lldb/tools/lldb-vscode/IOStream.cpp
11

There seems to be trailing whitespace here.

I can test build it in a couple hours

It still built fine for me now - thanks!

I don't feel knowledgeable enough to backport the commit, so if you can do
it, it would be great :)

Il giorno gio 4 feb 2021 alle ore 13:04 Martin Storsjö via Phabricator <
reviews@reviews.llvm.org> ha scritto:

mstorsjo added a comment.

In D96060#2542890 https://reviews.llvm.org/D96060#2542890, @mstorsjo
wrote:

I can test build it in a couple hours

It still built fine for me now - thanks!

Repository:

rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION

https://reviews.llvm.org/D96060/new/

https://reviews.llvm.org/D96060