aboutsummaryrefslogtreecommitdiff
path: root/src/server.cpp
diff options
context:
space:
mode:
authorGravatar Peter Powell2014-05-21 01:26:22 +0100
committerGravatar Attila Molnar2014-05-23 14:13:51 +0200
commite3bcf95ee996c058c73879c12ac5a487f8dcdf46 (patch)
tree11cb73fdd8eb3360b20185e8feac6fda9cf6f21d /src/server.cpp
parentReplace the configure templating system with something better. (diff)
Prefix all definitions in config.h to avoid potential collisions.
Diffstat (limited to 'src/server.cpp')
-rw-r--r--src/server.cpp4
1 files changed, 2 insertions, 2 deletions
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)