# HG changeset patch
# User Andre Heinecke <andre.heinecke@intevation.de>
# Date 1481207647 -3600
# Node ID 9daf778feaf1734bc51e26215a76398297627223
# Parent  e6b8f1590a014a6fd0ae3b6a8aa204a323929070
Fix usage of WIN32 macro. With c++11 this is no longer set.

_WIN32 is the better macro to use anyway.

diff -r e6b8f1590a01 -r 9daf778feaf1 src/folderselectdialog.cpp
--- 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;
diff -r e6b8f1590a01 -r 9daf778feaf1 src/main.cpp
--- 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.
  *
diff -r e6b8f1590a01 -r 9daf778feaf1 src/strhelp.c
--- 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)
diff -r e6b8f1590a01 -r 9daf778feaf1 src/strhelp.h
--- 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
  *
diff -r e6b8f1590a01 -r 9daf778feaf1 src/util.h
--- 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
 
diff -r e6b8f1590a01 -r 9daf778feaf1 src/util_linux.c
--- a/src/util_linux.c	Thu Dec 08 15:25:08 2016 +0100
+++ b/src/util_linux.c	Thu Dec 08 15:34:07 2016 +0100
@@ -1,4 +1,4 @@
-#ifndef WIN32
+#ifndef _WIN32
 /* Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik
  * Software engineering by Intevation GmbH
  *
diff -r e6b8f1590a01 -r 9daf778feaf1 src/util_win.c
--- a/src/util_win.c	Thu Dec 08 15:25:08 2016 +0100
+++ b/src/util_win.c	Thu Dec 08 15:34:07 2016 +0100
@@ -1,4 +1,4 @@
-#ifdef WIN32
+#ifdef _WIN32
 /* Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik
  * Software engineering by Intevation GmbH
  *