Windows build fix.

diff --git a/icinga2.sln b/icinga2.sln
index e2c442c037333fd448ac5b636b729ec647de3a32..b62e3419b211c1a9f10784022b28f72c9347cf12 100644 (file)
--- a/icinga2.sln
+++ b/icinga2.sln
@@ -46,11 +46,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compat", "components\compat
                {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compatido", "components\compatido\compatido.vcxproj", "{7D0C062E-5199-4A5F-A31C-602275EBDF63}"
-       ProjectSection(ProjectDependencies) = postProject
-               {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}
-       EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components", "components", "{4A1773FD-DDED-4952-8700-C898E890554A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libraries", "libraries", "{BC82DE9C-42E2-4880-92DA-C2269D2F6416}"
@@ -163,14 +158,6 @@ Global
                {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|Win32.Build.0 = Release|Win32
                {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|Win64.ActiveCfg = Release|x64
                {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|Win64.Build.0 = Release|x64
-               {7D0C062E-5199-4A5F-A31C-602275EBDF63}.Debug|Win32.ActiveCfg = Debug|Win32
-               {7D0C062E-5199-4A5F-A31C-602275EBDF63}.Debug|Win32.Build.0 = Debug|Win32
-               {7D0C062E-5199-4A5F-A31C-602275EBDF63}.Debug|Win64.ActiveCfg = Debug|x64
-               {7D0C062E-5199-4A5F-A31C-602275EBDF63}.Debug|Win64.Build.0 = Debug|x64
-               {7D0C062E-5199-4A5F-A31C-602275EBDF63}.Release|Win32.ActiveCfg = Release|Win32
-               {7D0C062E-5199-4A5F-A31C-602275EBDF63}.Release|Win32.Build.0 = Release|Win32
-               {7D0C062E-5199-4A5F-A31C-602275EBDF63}.Release|Win64.ActiveCfg = Release|x64
-               {7D0C062E-5199-4A5F-A31C-602275EBDF63}.Release|Win64.Build.0 = Release|x64
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win32.ActiveCfg = Debug|Win32
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win32.Build.0 = Debug|Win32
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win64.ActiveCfg = Debug|x64
@@ -221,7 +208,6 @@ Global
                {17C93245-8C20-4316-9573-1AE41D918C10} = {4A1773FD-DDED-4952-8700-C898E890554A}
                {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C} = {4A1773FD-DDED-4952-8700-C898E890554A}
                {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA} = {4A1773FD-DDED-4952-8700-C898E890554A}
-               {7D0C062E-5199-4A5F-A31C-602275EBDF63} = {4A1773FD-DDED-4952-8700-C898E890554A}
                {2E6C1133-730F-4875-A72C-B455B1DD4C5C} = {4A1773FD-DDED-4952-8700-C898E890554A}
                {19CBCE06-3F5C-479A-BD75-E2AB6215D345} = {3BE47C55-D74A-46E6-8F8B-470B3FD29FB7}
                {66BED474-C33F-48F9-90BA-BBCFEDC006B8} = {3BE47C55-D74A-46E6-8F8B-470B3FD29FB7}

diff --git a/lib/base/objectlock.cpp b/lib/base/objectlock.cpp
index 1451810a591370fc9738cfe52585e75602d1112e..ad39976cadf06b4b24bd05b4529e2cd53ecf60c5 100644 (file)
--- a/lib/base/objectlock.cpp
+++ b/lib/base/objectlock.cpp
@@ -22,7 +22,11 @@
 using namespace icinga;
 
 #ifdef _DEBUG
+#      ifdef _MSC_VER
+static __declspec(thread) int g_LockCount;
+#      else /* _MSC_VER */
 static __thread int g_LockCount;
+#      endif /* _MSC_VER */
 #endif /* _DEBUG */
 
 ObjectLock::ObjectLock(void)