6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-10-20 09:24:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix VC++ compilation error

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19124 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jeff Cohen 2004-12-24 02:38:34 +00:00
parent e32beb78d5
commit cb652550b6
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/System/Win32/Path.cpp
View File

@ -23,6 +23,9 @@
#include <fstream>
#include <malloc.h>
// 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!

9
lib/System/Win32/Path.inc
View File

@ -23,6 +23,9 @@
#include <fstream>
#include <malloc.h>
// 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!