tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows build fix.

This commit is contained in:
Gunnar Beutner 2013-04-19 15:27:35 +02:00
parent d86767e8e3
commit 0fcbfdb236
10 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/livestatus/livestatus.vcxproj
View File

@ -31,7 +31,6 @@
<ClInclude Include="hoststable.h" />
<ClInclude Include="i2-livestatus.h" />
<ClInclude Include="component.h" />
<ClInclude Include="connection.h" />
<ClInclude Include="negatefilter.h" />
<ClInclude Include="orfilter.h" />
<ClInclude Include="query.h" />
@ -46,7 +45,6 @@
<ClCompile Include="combinerfilter.cpp" />
<ClCompile Include="commentstable.cpp" />
<ClCompile Include="component.cpp" />
<ClCompile Include="connection.cpp" />
<ClCompile Include="contactgroupstable.cpp" />
<ClCompile Include="contactstable.cpp" />
<ClCompile Include="downtimestable.cpp" />

6
components/livestatus/livestatus.vcxproj.filters
View File

@ -12,9 +12,6 @@
<ClInclude Include="i2-livestatus.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="connection.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="component.h">
<Filter>Headerdateien</Filter>
</ClInclude>
@ -71,9 +68,6 @@
<ClCompile Include="component.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="connection.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="query.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>

8
lib/base/base.vcxproj
View File

@ -22,11 +22,12 @@
<ClCompile Include="application.cpp" />
<ClCompile Include="array.cpp" />
<ClCompile Include="attribute.cpp" />
<ClCompile Include="connection.cpp" />
<ClCompile Include="bufferedstream.cpp" />
<ClCompile Include="convert.cpp" />
<ClCompile Include="dynamicobject.cpp" />
<ClCompile Include="dictionary.cpp" />
<ClCompile Include="dynamictype.cpp" />
<ClCompile Include="networkstream.cpp" />
<ClCompile Include="threadpool.cpp" />
<ClCompile Include="exception.cpp" />
<ClCompile Include="fifo.cpp" />
@ -60,11 +61,12 @@
<ClInclude Include="application.h" />
<ClInclude Include="array.h" />
<ClInclude Include="attribute.h" />
<ClInclude Include="connection.h" />
<ClInclude Include="bufferedstream.h" />
<ClInclude Include="convert.h" />
<ClInclude Include="dynamicobject.h" />
<ClInclude Include="dictionary.h" />
<ClInclude Include="dynamictype.h" />
<ClInclude Include="networkstream.h" />
<ClInclude Include="threadpool.h" />
<ClInclude Include="fifo.h" />
<ClInclude Include="logger_fwd.h" />
@ -255,4 +257,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

29
lib/base/base.vcxproj.filters
View File

@ -43,9 +43,6 @@
<ClCompile Include="scriptfunction.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="scripttask.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="fifo.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
@ -70,9 +67,6 @@
<ClCompile Include="stream_bio.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="connection.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="unixsocket.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
@ -94,9 +88,6 @@
<ClCompile Include="process-windows.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="eventqueue.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="attribute.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
@ -109,6 +100,10 @@
<ClCompile Include="tlsutility.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="threadpool.cpp" />
<ClCompile Include="scriptfunctionwrapper.cpp" />
<ClCompile Include="bufferedstream.cpp" />
<ClCompile Include="networkstream.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="application.h">
@ -156,15 +151,9 @@
<ClInclude Include="sysloglogger.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="asynctask.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="process.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="scripttask.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="scriptfunction.h">
<Filter>Headerdateien</Filter>
</ClInclude>
@ -192,9 +181,6 @@
<ClInclude Include="stream_bio.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="connection.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="unixsocket.h">
<Filter>Headerdateien</Filter>
</ClInclude>
@ -210,9 +196,6 @@
<ClInclude Include="objectlock.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="eventqueue.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="attribute.h">
<Filter>Headerdateien</Filter>
</ClInclude>
@ -234,6 +217,10 @@
<ClInclude Include="singleton.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="threadpool.h" />
<ClInclude Include="scriptfunctionwrapper.h" />
<ClInclude Include="bufferedstream.h" />
<ClInclude Include="networkstream.h" />
</ItemGroup>
<ItemGroup>
<Filter Include="Quelldateien">

4
lib/base/socket.cpp
View File

@ -220,7 +220,7 @@ void Socket::Listen(void)
*/
size_t Socket::Write(const void *buffer, size_t count)
{
int rc = send(GetFD(), buffer, count, 0);
int rc = send(GetFD(), (const char *)buffer, count, 0);
if (rc < 0) {
#ifndef _WIN32
@ -242,7 +242,7 @@ size_t Socket::Write(const void *buffer, size_t count)
*/
size_t Socket::Read(void *buffer, size_t count)
{
int rc = recv(GetFD(), buffer, count, 0);
int rc = recv(GetFD(), (char *)buffer, count, 0);
if (rc < 0) {
#ifndef _WIN32

4
lib/icinga/legacytimeperiod.cpp
View File

@ -340,8 +340,8 @@ Dictionary::Ptr LegacyTimePeriod::ProcessTimeRange(const String& timerange, tm *
end.tm_hour = Convert::ToLong(hd2[0]);
Dictionary::Ptr segment = boost::make_shared<Dictionary>();
segment->Set("begin", mktime(&begin));
segment->Set("end", mktime(&end));
segment->Set("begin", (long)mktime(&begin));
segment->Set("end", (long)mktime(&end));
return segment;
}

4
lib/remoting/remoting.vcxproj
View File

@ -22,7 +22,7 @@
<ClInclude Include="endpoint.h" />
<ClInclude Include="endpointmanager.h" />
<ClInclude Include="i2-remoting.h" />
<ClInclude Include="jsonrpcconnection.h" />
<ClInclude Include="jsonrpc.h" />
<ClInclude Include="requestmessage.h" />
<ClInclude Include="responsemessage.h" />
<ClInclude Include="messagepart.h" />
@ -30,7 +30,7 @@
<ItemGroup>
<ClCompile Include="endpoint.cpp" />
<ClCompile Include="endpointmanager.cpp" />
<ClCompile Include="jsonrpcconnection.cpp" />
<ClCompile Include="jsonrpc.cpp" />
<ClCompile Include="remoting-type.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>

8
lib/remoting/remoting.vcxproj.filters
View File

@ -16,12 +16,10 @@
<ClCompile Include="endpointmanager.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="jsonrpcconnection.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="remoting-type.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="jsonrpc.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="messagepart.h">
@ -42,9 +40,7 @@
<ClInclude Include="endpointmanager.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="jsonrpcconnection.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="jsonrpc.h" />
</ItemGroup>
<ItemGroup>
<Filter Include="Headerdateien">

7
test/test.vcxproj
View File

@ -159,7 +159,14 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="base-array.cpp" />
<ClCompile Include="base-convert.cpp" />
<ClCompile Include="base-dictionary.cpp" />
<ClCompile Include="base-fifo.cpp" />
<ClCompile Include="base-match.cpp" />
<ClCompile Include="base-object.cpp" />
<ClCompile Include="base-shellescape.cpp" />
<ClCompile Include="base-timer.cpp" />
<ClCompile Include="test.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

21
test/test.vcxproj.filters
View File

@ -21,5 +21,26 @@
<ClCompile Include="test.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="base-array.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="base-convert.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="base-fifo.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="base-match.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="base-object.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="base-shellescape.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="base-timer.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
</ItemGroup>
</Project>