diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2018-04-27 19:11:14 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2018-04-27 19:11:14 +0000 |
| commit | 1865df49960e34cc90d0083b0e0cd4771c0feb35 (patch) | |
| tree | e6c91dba6b86e3fc8970a42e8291771e32f82239 /clang/lib/Basic/VirtualFileSystem.cpp | |
| parent | ee5be798dae30d5f9414b01f76ff807edbc881aa (diff) | |
| download | bcm5719-llvm-1865df49960e34cc90d0083b0e0cd4771c0feb35.tar.gz bcm5719-llvm-1865df49960e34cc90d0083b0e0cd4771c0feb35.zip | |
s/LLVM_ON_WIN32/_WIN32/, clang
LLVM_ON_WIN32 is set exactly with MSVC and MinGW (but not Cygwin) in
HandleLLVMOptions.cmake, which is where _WIN32 defined too. Just use the
default macro instead of a reinvented one.
See thread "Replacing LLVM_ON_WIN32 with just _WIN32" on llvm-dev and cfe-dev.
No intended behavior change.
llvm-svn: 331069
Diffstat (limited to 'clang/lib/Basic/VirtualFileSystem.cpp')
| -rw-r--r-- | clang/lib/Basic/VirtualFileSystem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Basic/VirtualFileSystem.cpp b/clang/lib/Basic/VirtualFileSystem.cpp index 413d43994a3..3a0f041047a 100644 --- a/clang/lib/Basic/VirtualFileSystem.cpp +++ b/clang/lib/Basic/VirtualFileSystem.cpp @@ -967,7 +967,7 @@ class RedirectingFileSystem : public vfs::FileSystem { /// "." and "./" in their paths. FIXME: some unittests currently fail on /// win32 when using remove_dots and remove_leading_dotslash on paths. bool UseCanonicalizedPaths = -#ifdef LLVM_ON_WIN32 +#ifdef _WIN32 false; #else true; @@ -1560,7 +1560,7 @@ ErrorOr<Entry *> RedirectingFileSystem::lookupPath(const Twine &Path_) { ErrorOr<Entry *> RedirectingFileSystem::lookupPath(sys::path::const_iterator Start, sys::path::const_iterator End, Entry *From) { -#ifndef LLVM_ON_WIN32 +#ifndef _WIN32 assert(!isTraversalComponent(*Start) && !isTraversalComponent(From->getName()) && "Paths should not contain traversal components"); |
