Build fix for Windows.

diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index 5f4de4dd5989c91d65fc84851a60d3b8f780276a..2efdc6ba09bfd8035d3558fd9004addbe43b1158 100644 (file)
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -24,8 +24,6 @@
 #      define ICINGA_VERSION VERSION ", " GIT_MESSAGE
 
 #      include <ltdl.h>
-#else /* _WIN32 */
-#      define ICINGA_VERSION VERSION
 #endif /* _WIN32 */
 
 using namespace icinga;
@@ -51,7 +49,11 @@ int main(int argc, char **argv)
         * in the base library. */
        Application::SetMainThread();
 
-       Logger::Write(LogInformation, "icinga", "Icinga application loader (version: " ICINGA_VERSION ")");
+       Logger::Write(LogInformation, "icinga", "Icinga application loader"
+#ifndef _WIN32
+               " (version: " ICINGA_VERSION ")"
+#endif /* _WIN32 */
+       );
 
        if (argc < 3 || strcmp(argv[1], "-c") != 0) {
                stringstream msgbuf;

diff --git a/lib/base/base.vcxproj b/lib/base/base.vcxproj
index 50f17fab15dcf785426e9389e470682fa317147e..7a9b7b78c16be0997d94e344338d96fc5196a247 100644 (file)
--- a/lib/base/base.vcxproj
+++ b/lib/base/base.vcxproj
@@ -36,7 +36,6 @@
     <ClCompile Include="tcpclient.cpp" />
     <ClCompile Include="tcpserver.cpp" />
     <ClCompile Include="tcpsocket.cpp" />
-    <ClCompile Include="threadpool.cpp" />
     <ClCompile Include="timer.cpp" />
     <ClCompile Include="tlsclient.cpp" />
     <ClCompile Include="unix.cpp" />
@@ -69,7 +68,6 @@
     <ClInclude Include="tcpclient.h" />
     <ClInclude Include="tcpserver.h" />
     <ClInclude Include="tcpsocket.h" />
-    <ClInclude Include="threadpool.h" />
     <ClInclude Include="timer.h" />
     <ClInclude Include="tlsclient.h" />
     <ClInclude Include="unix.h" />

diff --git a/lib/base/base.vcxproj.filters b/lib/base/base.vcxproj.filters
index d059aaefcca3af85c87b9a80e9067395946860aa..a7b9317e4a13989212f0917ab3681361d53794db 100644 (file)
--- a/lib/base/base.vcxproj.filters
+++ b/lib/base/base.vcxproj.filters
@@ -34,9 +34,6 @@
     <ClCompile Include="tcpsocket.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="threadpool.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
     <ClCompile Include="timer.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
@@ -129,9 +126,6 @@
     <ClInclude Include="tcpsocket.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="threadpool.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="timer.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>