diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2015-10-02 14:52:04 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2015-10-02 14:52:04 +0200 |
| commit | 1845c028b8cb8496d1d78f0da738120e1c31401a (patch) | |
| tree | adf9fb436aea09be367aef8ed3b6cdbf6a46e34c /zen/zstring.h | |
| parent | 6.7 (diff) | |
| download | FreeFileSync-1845c028b8cb8496d1d78f0da738120e1c31401a.tar.gz FreeFileSync-1845c028b8cb8496d1d78f0da738120e1c31401a.tar.bz2 FreeFileSync-1845c028b8cb8496d1d78f0da738120e1c31401a.zip | |
6.8
Diffstat (limited to 'zen/zstring.h')
| -rw-r--r-- | zen/zstring.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/zen/zstring.h b/zen/zstring.h index f103faf7..2152954d 100644 --- a/zen/zstring.h +++ b/zen/zstring.h @@ -8,10 +8,9 @@ #define ZSTRING_H_INCLUDED #include "string_base.h" + #ifdef ZEN_LINUX #include <cstring> //strcmp -#elif defined ZEN_MAC -//#include <strings.h> //strcasecmp #endif @@ -66,7 +65,7 @@ typedef zen::Zbase<Zchar, zen::StorageRefCountThreadSafe, AllocatorFreeStoreChec -//Compare filenames: Windows does NOT distinguish between upper/lower-case, while Linux DOES +//Compare filepaths: Windows does NOT distinguish between upper/lower-case, while Linux DOES template <template <class, class> class SP, class AP> int cmpFileName(const zen::Zbase<Zchar, SP, AP>& lhs, const zen::Zbase<Zchar, SP, AP>& rhs); @@ -114,7 +113,7 @@ int cmpFileName(const zen::Zbase<Zchar, SP, AP>& lhs, const zen::Zbase<Zchar, SP #if defined ZEN_WIN || defined ZEN_MAC return z_impl::compareFilenamesNoCase(lhs.data(), rhs.data(), lhs.length(), rhs.length()); #elif defined ZEN_LINUX - return std::strcmp(lhs.c_str(), rhs.c_str()); //POSIX filenames don't have embedded 0 + return std::strcmp(lhs.c_str(), rhs.c_str()); //POSIX filepaths don't have embedded 0 //#elif defined ZEN_MAC // return ::strcasecmp(lhs.c_str(), rhs.c_str()); //locale-dependent! #endif |