From: Gunnar Beutner <gunnar@beutner.name>
Date: Tue, 29 Mar 2016 05:54:41 +0000 (+0200)
Subject: Build fix for Win64
X-Git-Tag: v2.4.5~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c788f38999ab9a3f058dfdec3c79be483f188d6;p=icinga2

Build fix for Win64

refs #11462
---

diff --git a/lib/base/objectlock.hpp b/lib/base/objectlock.hpp
index 2ef73ecf6..ea2e05484 100644
--- a/lib/base/objectlock.hpp
+++ b/lib/base/objectlock.hpp
@@ -62,7 +62,7 @@ public:
 
 #ifdef _WIN32
 #	ifdef _WIN64
-		while (InterlockedCompareExchange64(&object->m_Mutex, I2MUTEX_LOCKED, I2MUTEX_UNLOCKED) != I2MUTEX_UNLOCKED) {
+		while (InterlockedCompareExchange64((LONGLONG *)&object->m_Mutex, I2MUTEX_LOCKED, I2MUTEX_UNLOCKED) != I2MUTEX_UNLOCKED) {
 #	else /* _WIN64 */
 		while (InterlockedCompareExchange(&object->m_Mutex, I2MUTEX_LOCKED, I2MUTEX_UNLOCKED) != I2MUTEX_UNLOCKED) {
 #	endif /* _WIN64 */
@@ -84,7 +84,7 @@ public:
 		mtx->lock();
 #ifdef _WIN32
 #	ifdef _WIN64
-		InterlockedCompareExchange64(&object->m_Mutex, reinterpret_cast<LONGLONG>(mtx), I2MUTEX_LOCKED);
+		InterlockedCompareExchange64((LONGLONG *)&object->m_Mutex, reinterpret_cast<LONGLONG>(mtx), I2MUTEX_LOCKED);
 #	else /* _WIN64 */
 		InterlockedCompareExchange(&object->m_Mutex, reinterpret_cast<LONG>(mtx), I2MUTEX_LOCKED);
 #	endif /* _WIN64 */
diff --git a/lib/base/string-script.cpp b/lib/base/string-script.cpp
index 83aef1b19..7ea1c91ab 100644
--- a/lib/base/string-script.cpp
+++ b/lib/base/string-script.cpp
@@ -86,7 +86,7 @@ static Array::Ptr StringSplit(const String& delims)
 	return result;
 }
 
-static Value StringFind(const std::vector<Value>& args)
+static int StringFind(const std::vector<Value>& args)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	String self = vframe->Self;