Windows build fix.

diff --git a/components/cluster/clusterlistener.cpp b/components/cluster/clusterlistener.cpp
index ce86fb9b717cc4c635d95683ee85336d986c91a8..1a85d899af2014e691e59ffe2d940ae9a27bca04 100644 (file)
--- a/components/cluster/clusterlistener.cpp
+++ b/components/cluster/clusterlistener.cpp
@@ -1414,7 +1414,11 @@ void ClusterListener::MessageHandler(const Endpoint::Ptr& sender, const Dictiona
                Log(LogInformation, "cluster", "Processing config update for identity '" + identity + "'.");
 
                String dir = GetClusterDir() + "config/" + SHA256(identity);
+#ifndef _WIN32
                if (mkdir(dir.CStr(), 0700) < 0 && errno != EEXIST) {
+#else /*_ WIN32 */
+               if (mkdir(dir.CStr()) < 0 && errno != EEXIST) {
+#endif /* _WIN32 */
                        BOOST_THROW_EXCEPTION(posix_error()
                                << boost::errinfo_api_function("localtime")
                                << boost::errinfo_errno(errno));

diff --git a/lib/base/base.vcxproj b/lib/base/base.vcxproj
index f68d71ca7a072beb07ae1915694121f83c7b5111..bb8e0e86a9740731fdcc2a8a2612d85d4444ab74 100644 (file)
--- a/lib/base/base.vcxproj
+++ b/lib/base/base.vcxproj
@@ -62,6 +62,8 @@
     <ClCompile Include="unixsocket.cpp" />
     <ClCompile Include="utility.cpp" />
     <ClCompile Include="value.cpp" />
+    <ClCompile Include="workqueue.cpp" />
+    <ClCompile Include="zlibstream.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="application.h" />
@@ -112,6 +114,8 @@
     <ClInclude Include="utility.h" />
     <ClInclude Include="value.h" />
     <ClInclude Include="win32.h" />
+    <ClInclude Include="workqueue.h" />
+    <ClInclude Include="zlibstream.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

diff --git a/lib/base/base.vcxproj.filters b/lib/base/base.vcxproj.filters
index ac97bf4aa9d2d481da915058e5202cb6abe1573a..b7861d761a63d3a0e87a0afaf6354049d59e6f3e 100644 (file)
--- a/lib/base/base.vcxproj.filters
+++ b/lib/base/base.vcxproj.filters
@@ -127,6 +127,12 @@
     <ClCompile Include="threadpool.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="workqueue.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="zlibstream.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="application.h">
@@ -273,6 +279,12 @@
     <ClInclude Include="debug.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
+    <ClInclude Include="workqueue.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="zlibstream.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Quelldateien">

diff --git a/lib/base/stdiostream.h b/lib/base/stdiostream.h
index 228d6cfc2cac468304c99e989840857a1fcb2341..3eb30f151205a3a53ca896157c8156d602c740f7 100644 (file)
--- a/lib/base/stdiostream.h
+++ b/lib/base/stdiostream.h
@@ -26,7 +26,7 @@
 
 namespace icinga {
 
-class StdioStream : public Stream
+class I2_BASE_API StdioStream : public Stream
 {
 public:
        DECLARE_PTR_TYPEDEFS(StdioStream);

diff --git a/lib/base/tlsutility.h b/lib/base/tlsutility.h
index d25d2f849e7dfda0a615bda8e2b9f5b9152afa0b..e0eb4e971cff62c64799966f480c69edcf3c65bb 100644 (file)
--- a/lib/base/tlsutility.h
+++ b/lib/base/tlsutility.h
@@ -36,7 +36,7 @@ namespace icinga
 shared_ptr<SSL_CTX> I2_BASE_API MakeSSLContext(const String& pubkey, const String& privkey, const String& cakey);
 String I2_BASE_API GetCertificateCN(const shared_ptr<X509>& certificate);
 shared_ptr<X509> I2_BASE_API GetX509Certificate(const String& pemfile);
-String SHA256(const String& s);
+String I2_BASE_API SHA256(const String& s);
 
 class I2_BASE_API openssl_error : virtual public std::exception, virtual public boost::exception { };
 

diff --git a/lib/base/zlibstream.h b/lib/base/zlibstream.h
index 0b3d7926a6c799ba1ce3088d06378c156b653f63..f08688a9f0e586365b012aca5b1007d9ad93ffcd 100644 (file)
--- a/lib/base/zlibstream.h
+++ b/lib/base/zlibstream.h
@@ -28,7 +28,7 @@
 
 namespace icinga {
 
-class ZlibStream : public Stream
+class I2_BASE_API ZlibStream : public Stream
 {
 public:
        DECLARE_PTR_TYPEDEFS(ZlibStream);

diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp
index f9832658338f39e7a033391fc59e7afc5d11b4ba..391925c2e9542ec0f51b6d3196dd9fa460db9b5f 100644 (file)
--- a/lib/db_ido/servicedbobject.cpp
+++ b/lib/db_ido/servicedbobject.cpp
@@ -69,7 +69,7 @@ void ServiceDbObject::StaticInitialize(void)
 
        Service::OnEventCommandExecuted.connect(bind(&ServiceDbObject::AddEventHandlerHistory, _1));
 
-       ExternalCommandProcessor::OnNewExternalCommand.connect(bind(&ServiceDbObject::AddExternalCommandHistory, _1, _2, _3));
+       ExternalCommandProcessor::OnNewExternalCommand.connect(boost::bind(&ServiceDbObject::AddExternalCommandHistory, _1, _2, _3));
 }
 
 ServiceDbObject::ServiceDbObject(const DbType::Ptr& type, const String& name1, const String& name2)

diff --git a/lib/icinga/icinga.vcxproj b/lib/icinga/icinga.vcxproj
index 997a97d1ffc10243fbd00984f9ee9fa96d530082..67f047409ec8588944422b9d5b624d3ee443edb6 100644 (file)
--- a/lib/icinga/icinga.vcxproj
+++ b/lib/icinga/icinga.vcxproj
@@ -25,6 +25,7 @@
     <ClCompile Include="cib.cpp" />
     <ClCompile Include="command.cpp" />
     <ClCompile Include="compatutility.cpp" />
+    <ClCompile Include="domain.cpp" />
     <ClCompile Include="eventcommand.cpp" />
     <ClCompile Include="externalcommandprocessor.cpp" />
     <ClCompile Include="host.cpp" />
@@ -65,6 +66,7 @@
     <ClInclude Include="cib.h" />
     <ClInclude Include="command.h" />
     <ClInclude Include="compatutility.h" />
+    <ClInclude Include="domain.h" />
     <ClInclude Include="eventcommand.h" />
     <ClInclude Include="externalcommandprocessor.h" />
     <ClInclude Include="host.h" />

diff --git a/lib/icinga/icinga.vcxproj.filters b/lib/icinga/icinga.vcxproj.filters
index be841daac6e1bfa4010222f1e2fc9b4688ccfb2a..dbba51c21176df17d81d01862a7d7a2e33dd4d32 100644 (file)
--- a/lib/icinga/icinga.vcxproj.filters
+++ b/lib/icinga/icinga.vcxproj.filters
@@ -100,6 +100,9 @@
     <ClCompile Include="service-event.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="domain.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="i2-icinga.h">
@@ -183,6 +186,9 @@
     <ClInclude Include="perfdatawriter.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
+    <ClInclude Include="domain.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Headerdateien">