Build fixes for *NIX.

diff --git a/icinga/Makefile.am b/icinga/Makefile.am
index f6dc165540fb7704e75c050792c9d729ff10a23e..4a7292571b5bfbbb5f75186435e7b529c1858a9c 100644 (file)
--- a/icinga/Makefile.am
+++ b/icinga/Makefile.am
@@ -14,6 +14,8 @@ libicinga_la_SOURCES =  \
        i2-icinga.h \
        jsonrpcendpoint.cpp \
        jsonrpcendpoint.h \
+       subscriptioncomponent.cpp \
+       subscriptioncomponent.h \
        virtualendpoint.cpp \
        virtualendpoint.h
 

diff --git a/icinga/endpointmanager.h b/icinga/endpointmanager.h
index ed981297f11897dcd19cac0b448c42c35267b933..e125dc94d94465557bf0b8839d46855d3b018c79 100644 (file)
--- a/icinga/endpointmanager.h
+++ b/icinga/endpointmanager.h
@@ -6,7 +6,7 @@ namespace icinga
 
 struct I2_ICINGA_API NewEndpointEventArgs : public EventArgs
 {
-       Endpoint::Ptr Endpoint;
+       icinga::Endpoint::Ptr Endpoint;
 };
 
 class I2_ICINGA_API EndpointManager : public Object

diff --git a/icinga/jsonrpcendpoint.cpp b/icinga/jsonrpcendpoint.cpp
index cc48665ac0d059eb936422a568989d0c11102571..ce322483fdb6bc55ed3e2593cae77c7e6fdd4a4b 100644 (file)
--- a/icinga/jsonrpcendpoint.cpp
+++ b/icinga/jsonrpcendpoint.cpp
@@ -32,7 +32,7 @@ bool JsonRpcEndpoint::IsLocal(void) const
 
 bool JsonRpcEndpoint::IsConnected(void) const
 {
-       return m_Client;
+       return (bool)m_Client;
 }
 
 void JsonRpcEndpoint::ProcessRequest(Endpoint::Ptr sender, const JsonRpcRequest& message)