From cb652550b67807b7b553e0eacc3e5af62cce91c3 Mon Sep 17 00:00:00 2001 From: Jeff Cohen Date: Fri, 24 Dec 2004 02:38:34 +0000 Subject: [PATCH] Fix VC++ compilation error git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19124 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/System/Win32/Path.cpp | 9 +++++++-- lib/System/Win32/Path.inc | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/System/Win32/Path.cpp b/lib/System/Win32/Path.cpp index c50877afb1a..9377c426454 100644 --- a/lib/System/Win32/Path.cpp +++ b/lib/System/Win32/Path.cpp @@ -23,6 +23,9 @@ #include #include +// We need to undo a macro defined in Windows.h, otherwise we won't compile: +#undef CopyFile + static void FlipBackSlashes(std::string& s) { for (size_t i = 0; i < s.size(); i++) if (s[i] == '\\') @@ -574,13 +577,15 @@ bool Path::getMagicNumber(std::string& Magic, unsigned len) const { void sys::CopyFile(const sys::Path &Dest, const sys::Path &Src) { - if (!::CopyFile(Src.c_str(), Dest.c_str(), false)) + // Can't use CopyFile macro defined in Windows.h because it would mess up the + // above line. We use the expansion it would have in a non-UNICODE build. + if (!::CopyFileA(Src.c_str(), Dest.c_str(), false)) ThrowError("Can't copy '" + Src.toString() + "' to '" + Dest.toString() + "'"); } void -Path::makeUnique( bool reuse_current ) { +Path::makeUnique(bool reuse_current) { if (reuse_current && !exists()) return; // File doesn't exist already, just use it! diff --git a/lib/System/Win32/Path.inc b/lib/System/Win32/Path.inc index c50877afb1a..9377c426454 100644 --- a/lib/System/Win32/Path.inc +++ b/lib/System/Win32/Path.inc @@ -23,6 +23,9 @@ #include #include +// We need to undo a macro defined in Windows.h, otherwise we won't compile: +#undef CopyFile + static void FlipBackSlashes(std::string& s) { for (size_t i = 0; i < s.size(); i++) if (s[i] == '\\') @@ -574,13 +577,15 @@ bool Path::getMagicNumber(std::string& Magic, unsigned len) const { void sys::CopyFile(const sys::Path &Dest, const sys::Path &Src) { - if (!::CopyFile(Src.c_str(), Dest.c_str(), false)) + // Can't use CopyFile macro defined in Windows.h because it would mess up the + // above line. We use the expansion it would have in a non-UNICODE build. + if (!::CopyFileA(Src.c_str(), Dest.c_str(), false)) ThrowError("Can't copy '" + Src.toString() + "' to '" + Dest.toString() + "'"); } void -Path::makeUnique( bool reuse_current ) { +Path::makeUnique(bool reuse_current) { if (reuse_current && !exists()) return; // File doesn't exist already, just use it! -- 2.34.1