From 7f0ced592cee8b0d1942a6ae318c264f8c55948c Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar@beutner.name>
Date: Thu, 23 Oct 2014 19:07:14 +0200
Subject: [PATCH] Build fix for Windows and RHEL 5

fixes #7433
---
 lib/cli/agentblackandwhitelistcommand.cpp | 4 ++--
 lib/cli/agentblackandwhitelistcommand.hpp | 2 +-
 lib/cli/repositoryobjectcommand.cpp       | 8 ++++----
 lib/cli/repositoryobjectcommand.hpp       | 2 +-
 lib/cli/repositoryutility.cpp             | 5 +++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/cli/agentblackandwhitelistcommand.cpp b/lib/cli/agentblackandwhitelistcommand.cpp
index 5bf21f189..506175a17 100644
--- a/lib/cli/agentblackandwhitelistcommand.cpp
+++ b/lib/cli/agentblackandwhitelistcommand.cpp
@@ -27,8 +27,8 @@
 using namespace icinga;
 namespace po = boost::program_options;
 
-REGISTER_BLACKANDWHITELIST_CLICOMMAND("whitelist");
-REGISTER_BLACKANDWHITELIST_CLICOMMAND("blacklist");
+REGISTER_BLACKANDWHITELIST_CLICOMMAND(whitelist);
+REGISTER_BLACKANDWHITELIST_CLICOMMAND(blacklist);
 
 RegisterBlackAndWhitelistCLICommandHelper::RegisterBlackAndWhitelistCLICommandHelper(const String& type)
 {
diff --git a/lib/cli/agentblackandwhitelistcommand.hpp b/lib/cli/agentblackandwhitelistcommand.hpp
index 921dec527..cd103660e 100644
--- a/lib/cli/agentblackandwhitelistcommand.hpp
+++ b/lib/cli/agentblackandwhitelistcommand.hpp
@@ -68,7 +68,7 @@ public:
 
 #define REGISTER_BLACKANDWHITELIST_CLICOMMAND(type) \
 	namespace { namespace UNIQUE_NAME(blackandwhitelist) { \
-		I2_EXPORT icinga::RegisterBlackAndWhitelistCLICommandHelper l_RegisterBlackAndWhitelistCLICommand(type); \
+		I2_EXPORT icinga::RegisterBlackAndWhitelistCLICommandHelper l_RegisterBlackAndWhitelistCLICommand_ ## type(#type); \
 	} }
 
 }
diff --git a/lib/cli/repositoryobjectcommand.cpp b/lib/cli/repositoryobjectcommand.cpp
index a623a44a8..c8db20174 100644
--- a/lib/cli/repositoryobjectcommand.cpp
+++ b/lib/cli/repositoryobjectcommand.cpp
@@ -31,10 +31,10 @@
 using namespace icinga;
 namespace po = boost::program_options;
 
-REGISTER_REPOSITORY_CLICOMMAND("Host");
-REGISTER_REPOSITORY_CLICOMMAND("Service");
-REGISTER_REPOSITORY_CLICOMMAND("Zone");
-REGISTER_REPOSITORY_CLICOMMAND("Endpoint");
+REGISTER_REPOSITORY_CLICOMMAND(Host);
+REGISTER_REPOSITORY_CLICOMMAND(Service);
+REGISTER_REPOSITORY_CLICOMMAND(Zone);
+REGISTER_REPOSITORY_CLICOMMAND(Endpoint);
 
 RegisterRepositoryCLICommandHelper::RegisterRepositoryCLICommandHelper(const String& type)
 {
diff --git a/lib/cli/repositoryobjectcommand.hpp b/lib/cli/repositoryobjectcommand.hpp
index 4b9f83397..8cf33ba13 100644
--- a/lib/cli/repositoryobjectcommand.hpp
+++ b/lib/cli/repositoryobjectcommand.hpp
@@ -70,7 +70,7 @@ public:
 
 #define REGISTER_REPOSITORY_CLICOMMAND(type) \
 	namespace { namespace UNIQUE_NAME(repositoryobject) { \
-		I2_EXPORT icinga::RegisterRepositoryCLICommandHelper l_RegisterRepositoryCLICommand(type); \
+		I2_EXPORT icinga::RegisterRepositoryCLICommandHelper l_RegisterRepositoryCLICommand_ ## type(#type); \
 	} }
 
 }
diff --git a/lib/cli/repositoryutility.cpp b/lib/cli/repositoryutility.cpp
index 584d5854c..64a807bc6 100644
--- a/lib/cli/repositoryutility.cpp
+++ b/lib/cli/repositoryutility.cpp
@@ -30,6 +30,7 @@
 #include "base/console.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string/replace.hpp>
 #include <fstream>
 #include <iostream>
 
@@ -206,7 +207,7 @@ bool RepositoryUtility::WriteObjectToRepository(const String& path, const String
         fp.close();
 
 #ifdef _WIN32
-	_unlink(filename.CStr());
+	_unlink(path.CStr());
 #endif /* _WIN32 */
 
 	if (rename(tempPath.CStr(), path.CStr()) < 0) {
@@ -238,7 +239,7 @@ bool RepositoryUtility::WriteObjectToRepositoryChangeLog(const String& path, con
         fp.close();
 
 #ifdef _WIN32
-	_unlink(filename.CStr());
+	_unlink(path.CStr());
 #endif /* _WIN32 */
 
 	if (rename(tempPath.CStr(), path.CStr()) < 0) {
-- 
2.40.0