Win64 build fix.

diff --git a/components/livestatus/statustable.cpp b/components/livestatus/statustable.cpp
index 7379d6d3b56b4b37ba10d772e7b441fe063ed254..1be42ebc1205055464ba0f2843bb7fe650c8d064 100644 (file)
--- a/components/livestatus/statustable.cpp
+++ b/components/livestatus/statustable.cpp
@@ -145,12 +145,12 @@ Value StatusTable::ProgramStartAccessor(const Value& row)
 
 Value StatusTable::NumHostsAccessor(const Value& row)
 {
-       return DynamicType::GetObjects<Host>().size();
+       return static_cast<long>(DynamicType::GetObjects<Host>().size());
 }
 
 Value StatusTable::NumServicesAccessor(const Value& row)
 {
-       return DynamicType::GetObjects<Service>().size();
+       return static_cast<long>(DynamicType::GetObjects<Service>().size());
 }
 
 Value StatusTable::ProgramVersionAccessor(const Value& row)

diff --git a/lib/base/base.vcxproj b/lib/base/base.vcxproj
index bb8e0e86a9740731fdcc2a8a2612d85d4444ab74..534e443d549de4abb96a16b938e8b376cc99c72f 100644 (file)
--- a/lib/base/base.vcxproj
+++ b/lib/base/base.vcxproj
@@ -224,7 +224,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>dbghelp.lib;ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;libeay32MTd.lib;ssleay32MTd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>dbghelp.lib;ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Lib>
       <AdditionalDependencies>ws2_32.lib;shlwapi.lib</AdditionalDependencies>
@@ -272,7 +272,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>dbghelp.lib;ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;libeay32MT.lib;ssleay32MT.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>dbghelp.lib;ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Lib>
       <AdditionalDependencies>ws2_32.lib;shlwapi.lib</AdditionalDependencies>

diff --git a/lib/base/registry.h b/lib/base/registry.h
index 552f8c32e6532803c5c6af13fc90cbe968e79f37..071a5729269ac4e3e77c463e1630ce3fdd8b14f7 100644 (file)
--- a/lib/base/registry.h
+++ b/lib/base/registry.h
@@ -69,7 +69,7 @@ public:
 
        void Unregister(const String& name)
        {
-               int erased;
+               size_t erased;
 
                {
                        boost::mutex::scoped_lock lock(m_Mutex);