summaryrefslogtreecommitdiff
path: root/zen/zstring.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:24:59 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:24:59 +0200
commita1c91f4695e208d5a8f80dc37b1818169b7829ff (patch)
tree52f5134376d17c99b6c9e53133a2eb5cf171377c /zen/zstring.cpp
parent5.16 (diff)
downloadFreeFileSync-a1c91f4695e208d5a8f80dc37b1818169b7829ff.tar.gz
FreeFileSync-a1c91f4695e208d5a8f80dc37b1818169b7829ff.tar.bz2
FreeFileSync-a1c91f4695e208d5a8f80dc37b1818169b7829ff.zip
5.17
Diffstat (limited to 'zen/zstring.cpp')
-rw-r--r--zen/zstring.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/zen/zstring.cpp b/zen/zstring.cpp
index 085e6f72..a469ade2 100644
--- a/zen/zstring.cpp
+++ b/zen/zstring.cpp
@@ -7,11 +7,11 @@
#include "zstring.h"
#include <stdexcept>
-#ifdef FFS_WIN
+#ifdef ZEN_WIN
#include "dll.h"
#include "win_ver.h"
-#elif defined FFS_MAC
+#elif defined ZEN_MAC
//#include <zen/scope_guard.h>
#include <ctype.h> //toupper()
#endif
@@ -64,7 +64,7 @@ private:
const std::string message = std::string("Memory leak detected!") + "\n\n"
+ "Candidates:\n" + leakingStrings;
-#ifdef FFS_WIN
+#ifdef ZEN_WIN
MessageBoxA(nullptr, message.c_str(), "Error", 0);
#else
std::cerr << message;
@@ -85,7 +85,7 @@ private:
void reportProblem(const std::string& message) //throw std::logic_error
{
-#ifdef FFS_WIN
+#ifdef ZEN_WIN
::MessageBoxA(nullptr, message.c_str(), "Error", 0);
#else
std::cerr << message;
@@ -128,7 +128,7 @@ time per call | function
*/
-#ifdef FFS_WIN
+#ifdef ZEN_WIN
namespace
{
#ifdef __MINGW32__ //MinGW is clueless...
@@ -227,7 +227,7 @@ void z_impl::makeFilenameUpperCase(wchar_t* str, size_t size)
throw std::runtime_error("Error converting to upper case! (LCMapString)");
}
-#elif defined FFS_MAC
+#elif defined ZEN_MAC
int z_impl::compareFilenamesNoCase(const char* lhs, const char* rhs, size_t sizeLhs, size_t sizeRhs)
{
return ::strcasecmp(lhs, rhs); //locale-dependent!
bgstack15