summaryrefslogtreecommitdiff
path: root/src/inspircd.cpp
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2014-05-21 01:26:22 +0100
committerAttila Molnar <attilamolnar@hush.com>2014-05-23 14:13:51 +0200
commite3bcf95ee996c058c73879c12ac5a487f8dcdf46 (patch)
tree11cb73fdd8eb3360b20185e8feac6fda9cf6f21d /src/inspircd.cpp
parente6d245a3e80c0e0c05476e5bd9c45a77e16fecec (diff)
Prefix all definitions in config.h to avoid potential collisions.
Diffstat (limited to 'src/inspircd.cpp')
-rw-r--r--src/inspircd.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 24072868a..efbb013ca 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -236,7 +236,7 @@ void InspIRCd::WritePID(const std::string &filename)
}
InspIRCd::InspIRCd(int argc, char** argv) :
- ConfigFileName(CONFIG_PATH "/inspircd.conf"),
+ ConfigFileName(INSPIRCD_CONFIG_PATH "/inspircd.conf"),
/* Functor pointer initialisation.
*
@@ -369,7 +369,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
if (do_version)
{
- std::cout << std::endl << VERSION << " " << REVISION << std::endl;
+ std::cout << std::endl << INSPIRCD_VERSION << " " << INSPIRCD_REVISION << std::endl;
Exit(EXIT_STATUS_NOERROR);
}