From e3bcf95ee996c058c73879c12ac5a487f8dcdf46 Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Wed, 21 May 2014 01:26:22 +0100
Subject: Prefix all definitions in config.h to avoid potential collisions.

---
 src/server.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/server.cpp')

diff --git a/src/server.cpp b/src/server.cpp
index 7fd62fdf8..ac638a08c 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -68,8 +68,8 @@ void InspIRCd::Rehash(const std::string& uuid)
 std::string InspIRCd::GetVersionString(bool getFullVersion)
 {
 	if (getFullVersion)
-		return VERSION " " + Config->ServerName + " :" SYSTEM " [" REVISION "," INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]";
-	return BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
+		return INSPIRCD_VERSION " " + Config->ServerName + " :" INSPIRCD_SYSTEM " [" INSPIRCD_REVISION "," INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]";
+	return INSPIRCD_BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
 }
 
 std::string UIDGenerator::GenerateSID(const std::string& servername, const std::string& serverdesc)
-- 
cgit v1.3.1-10-gc9f91