Reverting r297617 because it broke some bots:

http://bb.pgr.jp/builders/cmake-llvm-x86_64-linux/builds/49970

llvm-svn: 297618

1 files changed, 6 insertions, 15 deletions

diff --git a/llvm/lib/Support/Unix/Path.inc b/llvm/lib/Support/Unix/Path.inc
index b2669d51eb8..cdc692b8f1f 100644
--- a/llvm/lib/Support/Unix/Path.inc
+++ b/llvm/lib/Support/Unix/Path.inc
@@ -568,21 +568,12 @@ std::error_code status(const Twine &Path, file_status &Result, bool Follow) {
 std::error_code status(int FD, file_status &Result) {
   struct stat Status;
   int StatRet = ::fstat(FD, &Status);
-  return fillStatus(StatRet, Status, Result);

-}

-

-std::error_code setPermissions(const Twine &Path, perms Permissions) {

-  SmallString<128> PathStorage;

-  StringRef P = Path.toNullTerminatedStringRef(PathStorage);

-

-  if (::chmod(P.begin(), Permissions))

-    return std::error_code(errno, std::generic_category());

-  return std::error_code();

-}

-

-std::error_code setLastModificationAndAccessTime(int FD, TimePoint<> Time) {

-#if defined(HAVE_FUTIMENS)

-  timespec Times[2];

+  return fillStatus(StatRet, Status, Result);
+}
+
+std::error_code setLastModificationAndAccessTime(int FD, TimePoint<> Time) {
+#if defined(HAVE_FUTIMENS)
+  timespec Times[2];
   Times[0] = Times[1] = sys::toTimeSpec(Time);
   if (::futimens(FD, Times))
     return std::error_code(errno, std::generic_category());