From 9e89fe77ce532e1d2704f55159d5474b35645685 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 14 Jun 2013 21:41:33 +0000 Subject: Add GetCurrentDirectory back. It looks like clang-tools-extra/unittests/cpp11-migrate/TransformTest.cpp depends on the behaviour of the old one on Windows. Maybe a difference between GetCurrentDirectoryA and GetCurrentDirectoryW? git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184009 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Support/Windows/Path.inc | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lib/Support/Windows/Path.inc') diff --git a/lib/Support/Windows/Path.inc b/lib/Support/Windows/Path.inc index bb1f77a..4a6e563 100644 --- a/lib/Support/Windows/Path.inc +++ b/lib/Support/Windows/Path.inc @@ -20,6 +20,9 @@ #include #include +// We need to undo a macro defined in Windows.h, otherwise we won't compile: +#undef GetCurrentDirectory + // Windows happily accepts either forward or backward slashes, though any path // returned by a Win32 API will have backward slashes. As LLVM code basically // assumes forward slashes are used, backward slashs are converted where they @@ -196,6 +199,13 @@ Path::GetTemporaryDirectory(std::string* ErrMsg) { return *TempDirectory; } +Path +Path::GetCurrentDirectory() { + char pathname[MAX_PATH]; + ::GetCurrentDirectoryA(MAX_PATH,pathname); + return Path(pathname); +} + /// GetMainExecutable - Return the path to the main executable, given the /// value of argv[0] from program startup. Path Path::GetMainExecutable(const char *argv0, void *MainAddr) { -- cgit v1.1