From fe19ad328cf247a9d1114d7692deb4a368a91bb7 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 23 Feb 2017 12:40:21 -0800 Subject: [PATCH] Windows build fix. --- service/ControlPlane.cpp | 4 ++-- windows/ZeroTierOne/ZeroTierOne.vcxproj | 2 ++ windows/ZeroTierOne/ZeroTierOne.vcxproj.filters | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp index 8f59b0d2f..9ba001ea4 100644 --- a/service/ControlPlane.cpp +++ b/service/ControlPlane.cpp @@ -142,8 +142,8 @@ static void _moonToJson(nlohmann::json &mj,const World &world) Utils::snprintf(tmp,sizeof(tmp),"%.16llx",world.id()); mj["id"] = tmp; mj["timestamp"] = world.timestamp(); - mj["signature"] = Utils::hex(world.signature().data,world.signature().size()); - mj["updatesMustBeSignedBy"] = Utils::hex(world.updatesMustBeSignedBy().data,world.updatesMustBeSignedBy().size()); + mj["signature"] = Utils::hex(world.signature().data,(unsigned int)world.signature().size()); + mj["updatesMustBeSignedBy"] = Utils::hex(world.updatesMustBeSignedBy().data,(unsigned int)world.updatesMustBeSignedBy().size()); nlohmann::json ra = nlohmann::json::array(); for(std::vector::const_iterator r(world.roots().begin());r!=world.roots().end();++r) { nlohmann::json rj; diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj index 7afdfb17b..d0b027fac 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj @@ -41,6 +41,7 @@ + @@ -109,6 +110,7 @@ + diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters index da673f61c..1b7b469d6 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters @@ -246,6 +246,9 @@ Source Files\service + + Source Files\node + @@ -482,6 +485,9 @@ Header Files\ext\json + + Header Files\node +