Borland: Fixed compiler errors
This commit is contained in:
parent
d5883ef0c4
commit
1ec32e27db
|
@ -135,7 +135,14 @@ static HANDLE MyFindFirstFile(std::string path, LPWIN32_FIND_DATA findData)
|
||||||
|
|
||||||
static BOOL MyFileExists(std::string path)
|
static BOOL MyFileExists(std::string path)
|
||||||
{
|
{
|
||||||
|
#ifdef __BORLANDC__
|
||||||
|
DWORD fa = GetFileAttributes(path.c_str());
|
||||||
|
BOOL result = FALSE;
|
||||||
|
if (fa != INVALID_FILE_ATTRIBUTES && !(fa & FILE_ATTRIBUTE_DIRECTORY))
|
||||||
|
result = TRUE;
|
||||||
|
#else
|
||||||
BOOL result = PathFileExists(path.c_str());
|
BOOL result = PathFileExists(path.c_str());
|
||||||
|
#endif
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <ctype.h> // Borland: tolower
|
||||||
#include "pathmatch.h"
|
#include "pathmatch.h"
|
||||||
|
|
||||||
PathMatch::PathMatch(const std::vector<std::string> &masks)
|
PathMatch::PathMatch(const std::vector<std::string> &masks)
|
||||||
|
|
|
@ -288,7 +288,7 @@ static bool isFallThroughComment(std::string comment)
|
||||||
// convert comment to lower case without whitespace
|
// convert comment to lower case without whitespace
|
||||||
std::transform(comment.begin(), comment.end(), comment.begin(), tolowerWrapper);
|
std::transform(comment.begin(), comment.end(), comment.begin(), tolowerWrapper);
|
||||||
for (std::string::iterator i = comment.begin(); i != comment.end();) {
|
for (std::string::iterator i = comment.begin(); i != comment.end();) {
|
||||||
if (::isspace(static_cast<unsigned char>(*i)))
|
if (std::isspace(static_cast<unsigned char>(*i)))
|
||||||
i = comment.erase(i);
|
i = comment.erase(i);
|
||||||
else
|
else
|
||||||
++i;
|
++i;
|
||||||
|
|
|
@ -33,6 +33,11 @@
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <climits>
|
#include <climits>
|
||||||
|
|
||||||
|
// Define ULLONG_MAX and LLONG_MAX for Borland
|
||||||
|
#ifdef __BORLANDC__
|
||||||
|
#define ULLONG_MAX ULONG_MAX
|
||||||
|
#define LLONG_MAX LONG_MAX
|
||||||
|
#endif
|
||||||
|
|
||||||
//---------------------------------------------------------------------------
|
//---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue