Fix Livestatus tests on Windows

fixes #8486

diff --git a/lib/cli/daemonutility.hpp b/lib/cli/daemonutility.hpp
index 4c389e31734696b11afe9082818065a98dc1e829..f7025ac8a1ba1f285dcc23b86c8f1aa2345f029a 100644 (file)
--- a/lib/cli/daemonutility.hpp
+++ b/lib/cli/daemonutility.hpp
@@ -17,20 +17,26 @@
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
 ******************************************************************************/
 
-#ifndef DAEMONUTILIT_H
-#define DAEMONUTILIT_H
+#ifndef DAEMONUTILITY_H
+#define DAEMONUTILITY_H
 
-//#include "base/i2-base.hpp"
+#include "cli/i2-cli.hpp"
 #include "base/string.hpp"
 #include <boost/program_options.hpp>
 
 namespace icinga
 {
-class DaemonUtility
+
+/**
+ * @ingroup cli
+ */
+class I2_CLI_API DaemonUtility
 {
 public:
        static bool ValidateConfigFiles(const std::vector<std::string>& configs, const String& objectsFile = String());
        static bool LoadConfigFiles(const std::vector<std::string>& configs, const String& appType, const String& objectsFile = String(), const String& varsfile = String());
 };
+
 }
-#endif /*DAEMONULITIY_H*/
\ No newline at end of file
+
+#endif /* DAEMONULITIY_H */

diff --git a/lib/cli/featureutility.hpp b/lib/cli/featureutility.hpp
index 2c5233de25e3be7b70694de26676d0db8181fa96..2a9f7763dd4f78c600ed10a71363daf95b8337bd 100644 (file)
--- a/lib/cli/featureutility.hpp
+++ b/lib/cli/featureutility.hpp
@@ -21,6 +21,7 @@
 #define FEATUREUTILITY_H
 
 #include "base/i2-base.hpp"
+#include "cli/i2-cli.hpp"
 #include "base/string.hpp"
 #include <vector>
 #include <iostream>
@@ -31,7 +32,7 @@ namespace icinga
 /**
  * @ingroup cli
  */
-class FeatureUtility
+class I2_CLI_API FeatureUtility
 {
 public:
        static String GetFeaturesAvailablePath(void);

diff --git a/lib/cli/nodeutility.hpp b/lib/cli/nodeutility.hpp
index c881e88c57dfa4ebbe7c5039a6085607f62cecd5..55d291c84fe5851947890db270fdef39f7a47835 100644 (file)
--- a/lib/cli/nodeutility.hpp
+++ b/lib/cli/nodeutility.hpp
@@ -21,6 +21,7 @@
 #define AGENTUTILITY_H
 
 #include "base/i2-base.hpp"
+#include "cli/i2-cli.hpp"
 #include "base/dictionary.hpp"
 #include "base/array.hpp"
 #include "base/value.hpp"
@@ -33,7 +34,7 @@ namespace icinga
 /**
  * @ingroup cli
  */
-class NodeUtility
+class I2_CLI_API NodeUtility
 {
 public:
        static String GetRepositoryPath(void);

diff --git a/lib/cli/objectlistutility.hpp b/lib/cli/objectlistutility.hpp
index 5fae1dd990f72d5453126c53c7f462f32d963079..179147e1ad6a0448cc75f9c59d55b72f71a3e15d 100644 (file)
--- a/lib/cli/objectlistutility.hpp
+++ b/lib/cli/objectlistutility.hpp
@@ -20,6 +20,7 @@
 #define OBJECTLISTUTILITY_H
 
 #include "base/i2-base.hpp"
+#include "cli/i2-cli.hpp"
 #include "base/dictionary.hpp"
 #include "base/array.hpp"
 #include "base/value.hpp"
@@ -27,16 +28,15 @@
 
 namespace icinga
 {
-class ObjectListUtility
+
+/**
+ * @ingroup cli
+ */
+class I2_CLI_API ObjectListUtility
 {
 public:
-       /*
-        * Print decoded json blob *message* to *fp*, filtering by *name_filter* and *type_filter*.
-        * An enumeration by type is written to *type_count*
-        * *first* needs to be true
-        * returns true if object was printed
-       */
        static bool PrintObject(std::ostream& fp, bool& first, const String& message, std::map<String, int>& type_count, const String& name_filter, const String& type_filter);
+
 private:
        static void PrintProperties(std::ostream& fp, const Dictionary::Ptr& props, const Dictionary::Ptr& debug_hints, int indent);
        static void PrintHints(std::ostream& fp, const Dictionary::Ptr& debug_hints, int indent);
@@ -44,5 +44,7 @@ private:
        static void PrintValue(std::ostream& fp, const Value& val);
        static void PrintArray(std::ostream& fp, const Array::Ptr& arr);
 };
+
 }
-#endif /* OBJECTLISTUTILITY_H */
\ No newline at end of file
+
+#endif /* OBJECTLISTUTILITY_H */

diff --git a/lib/cli/pkiutility.hpp b/lib/cli/pkiutility.hpp
index 2baf63a55c8b2938cbece7a2ad20936639c1a42f..cfa2230e8e5cd9a8b2920770e96fdd0dea3f5327 100644 (file)
--- a/lib/cli/pkiutility.hpp
+++ b/lib/cli/pkiutility.hpp
@@ -21,6 +21,7 @@
 #define PKIUTILITY_H
 
 #include "base/i2-base.hpp"
+#include "cli/i2-cli.hpp"
 #include "base/dictionary.hpp"
 #include "base/string.hpp"
 
@@ -30,7 +31,7 @@ namespace icinga
 /**
  * @ingroup cli
  */
-class PkiUtility
+class I2_CLI_API PkiUtility
 {
 public:
        static String GetPkiPath(void);

diff --git a/lib/cli/repositoryutility.hpp b/lib/cli/repositoryutility.hpp
index ba6653d00b44facfc59832930952d859f12536a8..d47cc6ccb422e79c24ea2637005bdecb4e8547c1 100644 (file)
--- a/lib/cli/repositoryutility.hpp
+++ b/lib/cli/repositoryutility.hpp
@@ -21,6 +21,7 @@
 #define REPOSITORYUTILITY_H
 
 #include "base/i2-base.hpp"
+#include "cli/i2-cli.hpp"
 #include "base/dictionary.hpp"
 #include "base/array.hpp"
 #include "base/value.hpp"
@@ -33,7 +34,7 @@ namespace icinga
 /**
  * @ingroup cli
  */
-class RepositoryUtility
+class I2_CLI_API RepositoryUtility
 {
 public:
        static Dictionary::Ptr GetArgumentAttributes(const std::vector<std::string>& arguments);

diff --git a/lib/cli/variableutility.hpp b/lib/cli/variableutility.hpp
index e2e794f66f06a1b7cf9ac2050beddb0429a9902e..9a0efe268821b942d4904f7910c4ad7410bd22e0 100644 (file)
--- a/lib/cli/variableutility.hpp
+++ b/lib/cli/variableutility.hpp
@@ -21,6 +21,7 @@
 #define VARIABLEUTILITY_H
 
 #include "base/i2-base.hpp"
+#include "cli/i2-cli.hpp"
 #include "base/dictionary.hpp"
 #include "base/string.hpp"
 #include <ostream>
@@ -31,7 +32,7 @@ namespace icinga
 /**
  * @ingroup cli
  */
-class VariableUtility
+class I2_CLI_API VariableUtility
 {
 public:
        static Value GetVariable(const String& name);
@@ -40,7 +41,6 @@ public:
 private:
        VariableUtility(void);
 
-
 };
 
 }

diff --git a/lib/livestatus/column.hpp b/lib/livestatus/column.hpp
index 0209586b2308d422d434a258fe528d8ee9c4f547..992abbec581872a955c7cee5373943823891cc35 100644 (file)
--- a/lib/livestatus/column.hpp
+++ b/lib/livestatus/column.hpp
@@ -20,7 +20,6 @@
 #ifndef COLUMN_H
 #define COLUMN_H
 
-#include "livestatus/i2-livestatus.hpp"
 #include "livestatus/i2-livestatus.hpp"
 #include "base/value.hpp"
 #include <boost/function.hpp>