Borland: Fixed compiler errors

Daniel Marjam&auml;ki · Daniel Marjam&auml;ki · commit 1ec32e27dbbb · 2011-10-16T07:52:54.000+02:00
diff --git a/cli/filelister.cpp b/cli/filelister.cpp
@@ -135,7 +135,14 @@ static HANDLE MyFindFirstFile(std::string path, LPWIN32_FIND_DATA findData)
 
 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());
+#endif
     return result;
 }
 
diff --git a/cli/pathmatch.cpp b/cli/pathmatch.cpp
@@ -17,6 +17,7 @@
  */
 
 #include <algorithm>
+#include <ctype.h>      // Borland: tolower
 #include "pathmatch.h"
 
 PathMatch::PathMatch(const std::vector<std::string> &masks)
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
@@ -288,7 +288,7 @@ static bool isFallThroughComment(std::string comment)
     // convert comment to lower case without whitespace
     std::transform(comment.begin(), comment.end(), comment.begin(), tolowerWrapper);
     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);
         else
             ++i;
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -33,6 +33,11 @@
 #include <algorithm>
 #include <climits>
 
+// Define ULLONG_MAX and LLONG_MAX for Borland
+#ifdef __BORLANDC__
+#define ULLONG_MAX ULONG_MAX
+#define LLONG_MAX LONG_MAX
+#endif
 
 //---------------------------------------------------------------------------
 

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,14 @@ static HANDLE MyFindFirstFile(std::string path, LPWIN32_FIND_DATA findData)`
`135`	`135`
`136`	`136`	`static BOOL MyFileExists(std::string path)`
`137`	`137`	`{`
	`138`	`+#ifdef __BORLANDC__`
	`139`	`+ DWORD fa = GetFileAttributes(path.c_str());`
	`140`	`+ BOOL result = FALSE;`
	`141`	`+ if (fa != INVALID_FILE_ATTRIBUTES && !(fa & FILE_ATTRIBUTE_DIRECTORY))`
	`142`	`+ result = TRUE;`
	`143`	`+#else`
`138`	`144`	`BOOL result = PathFileExists(path.c_str());`
	`145`	`+#endif`
`139`	`146`	`return result;`
`140`	`147`	`}`
`141`	`148`