diff options
| author | Peter Powell <petpow@saberuk.com> | 2014-05-21 01:26:22 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-05-23 14:13:51 +0200 |
| commit | e3bcf95ee996c058c73879c12ac5a487f8dcdf46 (patch) | |
| tree | 11cb73fdd8eb3360b20185e8feac6fda9cf6f21d /include | |
| parent | e6d245a3e80c0e0c05476e5bd9c45a77e16fecec (diff) | |
Prefix all definitions in config.h to avoid potential collisions.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configreader.h | 8 | ||||
| -rw-r--r-- | include/modules.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/configreader.h b/include/configreader.h index f59fba389..f3b1f8b74 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -216,10 +216,10 @@ class CoreExport ServerConfig std::string Module; ServerPaths() - : Config(CONFIG_PATH) - , Data(DATA_PATH) - , Log(LOG_PATH) - , Module(MOD_PATH) { } + : Config(INSPIRCD_CONFIG_PATH) + , Data(INSPIRCD_DATA_PATH) + , Log(INSPIRCD_LOG_PATH) + , Module(INSPIRCD_MODULE_PATH) { } std::string PrependConfig(const std::string& fn) const { return FileSystem::ExpandPath(Config, fn); } std::string PrependData(const std::string& fn) const { return FileSystem::ExpandPath(Data, fn); } diff --git a/include/modules.h b/include/modules.h index 2a1ceb07a..a9db6919c 100644 --- a/include/modules.h +++ b/include/modules.h @@ -1343,7 +1343,7 @@ struct AllModuleList { { \ return new y; \ } \ - extern "C" DllExport const char inspircd_src_version[] = VERSION " " REVISION; + extern "C" DllExport const char inspircd_src_version[] = INSPIRCD_VERSION " " INSPIRCD_REVISION; #endif #define COMMAND_INIT(c) MODULE_INIT(CommandModule<c>) |