From 1a5e7c2f37f1f3b9969c01e61ab9347dcd546bee Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 14 Mar 2017 17:09:53 +0300
Subject: Fix compilation for windows 64 with mingw.

---
 src/utils/process.cpp     | 11 +++++++++--
 src/utils/stringutils.cpp |  6 +++---
 src/utils/stringutils.h   |  6 +++---
 3 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'src/utils')

diff --git a/src/utils/process.cpp b/src/utils/process.cpp
index 7aa1aa619..f84506024 100644
--- a/src/utils/process.cpp
+++ b/src/utils/process.cpp
@@ -241,10 +241,17 @@ bool execFile(const std::string &pathName A_UNUSED,
 
 #endif  // WIN32
 
-#ifdef WIN32
+#if defined WIN64
+bool openBrowser(std::string url)
+{
+    return reinterpret_cast<int64_t>(ShellExecute(nullptr, "open",
+        replaceAll(url, " ", "").c_str(),
+        nullptr, nullptr, SW_SHOWNORMAL)) > 32;
+}
+#elif defined WIN32
 bool openBrowser(std::string url)
 {
-    return reinterpret_cast<int>(ShellExecute(nullptr, "open",
+    return reinterpret_cast<int32_t>(ShellExecute(nullptr, "open",
         replaceAll(url, " ", "").c_str(),
         nullptr, nullptr, SW_SHOWNORMAL)) > 32;
 }
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 3663cc007..5a343cdbd 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -791,7 +791,7 @@ std::string toStringPrint(const unsigned int val)
     return str;
 }
 
-std::string toString(unsigned int num)
+std::string toString(uint32_t num)
 {
     char buf[30];
     buf[29] = '\0';
@@ -802,7 +802,7 @@ std::string toString(unsigned int num)
     return buf + idx + 1;
 }
 
-std::string toString(unsigned long num)
+std::string toString(uint64_t num)
 {
     char buf[100];
     buf[99] = '\0';
@@ -835,7 +835,7 @@ std::string toString(unsigned char num)
     return buf + idx + 1;
 }
 
-std::string toString(int num)
+std::string toString(int32_t num)
 {
     char buf[30];
     bool useSign(false);
diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h
index 6c2b6f097..02113d4c2 100644
--- a/src/utils/stringutils.h
+++ b/src/utils/stringutils.h
@@ -69,13 +69,13 @@ unsigned int atox(const std::string &str) A_WARN_UNUSED;
  * @param num the value to convert to a string
  * @return the string representation of arg
  */
-std::string toString(unsigned int num);
+std::string toString(uint32_t num);
 
-std::string toString(unsigned long num);
+std::string toString(uint64_t num);
 
 std::string toString(unsigned char num);
 
-std::string toString(int num);
+std::string toString(int32_t num);
 
 std::string toString(uint16_t num);
 
-- 
cgit v1.2.3-70-g09d2