diff options
| author | Pavel Labath <labath@google.com> | 2018-06-11 13:30:47 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2018-06-11 13:30:47 +0000 |
| commit | b2c73c4cc0b1b5077029ac6f44e56ed2d9c0b47e (patch) | |
| tree | 7548e26bf0fdcd01ec744f19d98f0c29f24427dd /llvm/lib/Support/Unix | |
| parent | 08dae4bb3c5b4ec8eff111c1da8cbb980ba479a2 (diff) | |
| download | bcm5719-llvm-b2c73c4cc0b1b5077029ac6f44e56ed2d9c0b47e.tar.gz bcm5719-llvm-b2c73c4cc0b1b5077029ac6f44e56ed2d9c0b47e.zip | |
Fix build errors on some configurations
It's been reported
<http://lists.llvm.org/pipermail/llvm-commits/Week-of-Mon-20180611/559616.html>
that template argument deduction for RetryAfterSignal fails if open is
not prefixed with "::".
This should help us build correctly on those platforms and explicitly
specifying the namespace is more correct anyway.
llvm-svn: 334403
Diffstat (limited to 'llvm/lib/Support/Unix')
| -rw-r--r-- | llvm/lib/Support/Unix/Path.inc | 2 | ||||
| -rw-r--r-- | llvm/lib/Support/Unix/Process.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Support/Unix/Path.inc b/llvm/lib/Support/Unix/Path.inc index 9800f866309..b4001fb7481 100644 --- a/llvm/lib/Support/Unix/Path.inc +++ b/llvm/lib/Support/Unix/Path.inc @@ -767,7 +767,7 @@ std::error_code openFile(const Twine &Name, int &ResultFD, SmallString<128> Storage; StringRef P = Name.toNullTerminatedStringRef(Storage); - if ((ResultFD = sys::RetryAfterSignal(-1, open, P.begin(), OpenFlags, Mode)) < + if ((ResultFD = sys::RetryAfterSignal(-1, ::open, P.begin(), OpenFlags, Mode)) < 0) return std::error_code(errno, std::generic_category()); #ifndef O_CLOEXEC diff --git a/llvm/lib/Support/Unix/Process.inc b/llvm/lib/Support/Unix/Process.inc index 43ba6d615c6..fa515d44f3f 100644 --- a/llvm/lib/Support/Unix/Process.inc +++ b/llvm/lib/Support/Unix/Process.inc @@ -199,7 +199,7 @@ std::error_code Process::FixupStandardFileDescriptors() { for (int StandardFD : StandardFDs) { struct stat st; errno = 0; - if (RetryAfterSignal(-1, fstat, StandardFD, &st) < 0) { + if (RetryAfterSignal(-1, ::fstat, StandardFD, &st) < 0) { assert(errno && "expected errno to be set if fstat failed!"); // fstat should return EBADF if the file descriptor is closed. if (errno != EBADF) @@ -211,7 +211,7 @@ std::error_code Process::FixupStandardFileDescriptors() { assert(errno == EBADF && "expected errno to have EBADF at this point!"); if (NullFD < 0) { - if ((NullFD = RetryAfterSignal(-1, open, "/dev/null", O_RDWR)) < 0) + if ((NullFD = RetryAfterSignal(-1, ::open, "/dev/null", O_RDWR)) < 0) return std::error_code(errno, std::generic_category()); } |
