Module: check_mk
Branch: master
Commit: e42e26443de8dbb3e30278f0b24b3b3e406da2dd
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e42e26443de8db…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Wed May 18 11:36:57 2016 +0200
IWYU.
---
livestatus/src/Logfile.cc | 6 +++---
livestatus/src/pnp4nagios.cc | 6 ++++++
livestatus/src/pnp4nagios.h | 2 ++
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc
index e80714a..076a2d8 100644
--- a/livestatus/src/Logfile.cc
+++ b/livestatus/src/Logfile.cc
@@ -23,13 +23,10 @@
// Boston, MA 02110-1301 USA.
#include "Logfile.h"
-#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
-#include <syslog.h>
#include <unistd.h>
-#include <cinttypes>
#include <utility>
#include "LogCache.h"
#include "LogEntry.h"
@@ -37,6 +34,9 @@
#include "logger.h"
#ifdef CMC
+#include <errno.h>
+#include <syslog.h>
+#include <cinttypes>
#include "cmc.h"
#endif
diff --git a/livestatus/src/pnp4nagios.cc b/livestatus/src/pnp4nagios.cc
index c687b32..bb4987f 100644
--- a/livestatus/src/pnp4nagios.cc
+++ b/livestatus/src/pnp4nagios.cc
@@ -24,8 +24,12 @@
#include "pnp4nagios.h"
#include <stddef.h>
+#ifdef CMC
#include <sys/stat.h>
+#endif
+#ifndef CMC
#include <unistd.h>
+#endif
using std::string;
@@ -50,6 +54,7 @@ string pnp_cleanup(const string& name) {
return replace_all(name, " /\\:", '_');
}
+#ifndef CMC
int pnpgraph_present(const string& host, const string& service) {
string pnp_path(g_pnp_path);
if (pnp_path.empty()) {
@@ -61,6 +66,7 @@ int pnpgraph_present(const string& host, const string& service)
{
.append(".xml"));
return access(path.c_str(), R_OK) == 0 ? 1 : 0;
}
+#endif
#ifdef CMC
string rrd_path(const string& host, const string& service,
diff --git a/livestatus/src/pnp4nagios.h b/livestatus/src/pnp4nagios.h
index e3b4855..ee0deb6 100644
--- a/livestatus/src/pnp4nagios.h
+++ b/livestatus/src/pnp4nagios.h
@@ -30,8 +30,10 @@
std::string pnp_cleanup(const std::string& name);
+#ifndef CMC
int pnpgraph_present(const std::string& host,
const std::string& service = "_HOST_");
+#endif
#ifdef CMC
// Determines if a RRD database exists and returns its path name. Returns an