Mercurial > retraceit
changeset 112:9daf778feaf1 1.4
Fix usage of WIN32 macro. With c++11 this is no longer set.
_WIN32 is the better macro to use anyway.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Thu, 08 Dec 2016 15:34:07 +0100 |
| parents | e6b8f1590a01 |
| children | 20ec21924338 |
| files | src/folderselectdialog.cpp src/main.cpp src/strhelp.c src/strhelp.h src/util.h src/util_linux.c src/util_win.c |
| diffstat | 7 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/folderselectdialog.cpp Thu Dec 08 15:25:08 2016 +0100 +++ b/src/folderselectdialog.cpp Thu Dec 08 15:34:07 2016 +0100 @@ -269,6 +269,8 @@ QDir::NoDotAndDotDot)) { qDebug() << "Looking at: " << subfolder; QStringList itemData = subfolder.split(PATTERN_SEPERATOR); + qDebug () << "Item Data size" << itemData.size() << patternSize + << itemData; if (itemData.size() != patternSize) { errors << subfolder; qDebug() << "Folder does not match pattern: " << subfolder;
--- a/src/main.cpp Thu Dec 08 15:25:08 2016 +0100 +++ b/src/main.cpp Thu Dec 08 15:34:07 2016 +0100 @@ -62,7 +62,7 @@ int realMain(int argc, char **argv); -#if defined(WIN32) && defined(UNICODE) +#if defined(_WIN32) && defined(UNICODE) /** @brief Unicode entry point. *
--- a/src/strhelp.c Thu Dec 08 15:25:08 2016 +0100 +++ b/src/strhelp.c Thu Dec 08 15:34:07 2016 +0100 @@ -18,7 +18,7 @@ #include <string.h> #include <assert.h> -#ifdef WIN32 +#ifdef _WIN32 #include <windows.h> #endif @@ -194,7 +194,7 @@ return ret; } -#ifdef WIN32 +#ifdef _WIN32 /* Adapted from GPGOL rev. e512053 */ char * wchar_to_utf8 (const wchar_t *string, size_t len)
--- a/src/strhelp.h Thu Dec 08 15:25:08 2016 +0100 +++ b/src/strhelp.h Thu Dec 08 15:34:07 2016 +0100 @@ -132,7 +132,7 @@ int str_base64_decode(char **dst, size_t *dst_size, char *src, size_t src_size); -#ifdef WIN32 +#ifdef _WIN32 /** @brief convert a utf8 string to utf16 wchar *
--- a/src/util.h Thu Dec 08 15:25:08 2016 +0100 +++ b/src/util.h Thu Dec 08 15:34:07 2016 +0100 @@ -28,7 +28,7 @@ */ char * get_install_dir(); -#ifndef WIN32 +#ifndef _WIN32 /**@def Some value to use as equivalent as MAX_PATH on windows */ #define MAX_PATH_LINUX 4000