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/configreader.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/configreader.cpp')

diff --git a/src/configreader.cpp b/src/configreader.cpp
index c82bda479..c4b5c4510 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -406,10 +406,10 @@ void ServerConfig::Fill()
 	Limits.MaxGecos = ConfValue("limits")->getInt("maxgecos", 128);
 	Limits.MaxAway = ConfValue("limits")->getInt("maxaway", 200);
 	Limits.MaxLine = ConfValue("limits")->getInt("maxline", 512);
-	Paths.Config = ConfValue("path")->getString("configdir", CONFIG_PATH);
-	Paths.Data = ConfValue("path")->getString("datadir", DATA_PATH);
-	Paths.Log = ConfValue("path")->getString("logdir", LOG_PATH);
-	Paths.Module = ConfValue("path")->getString("moduledir", MOD_PATH);
+	Paths.Config = ConfValue("path")->getString("configdir", INSPIRCD_CONFIG_PATH);
+	Paths.Data = ConfValue("path")->getString("datadir", INSPIRCD_DATA_PATH);
+	Paths.Log = ConfValue("path")->getString("logdir", INSPIRCD_LOG_PATH);
+	Paths.Module = ConfValue("path")->getString("moduledir", INSPIRCD_MODULE_PATH);
 	InvBypassModes = options->getBool("invitebypassmodes", true);
 	NoSnoticeStack = options->getBool("nosnoticestack", false);
 
-- 
cgit v1.3.1-10-gc9f91