diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-04-04 14:31:04 +0200 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2016-04-04 14:31:04 +0200 |
| commit | 9180e4664e8b76c53a96f98d82362482450bde84 (patch) | |
| tree | d7fdfc176bdb3c2515bd70cb760110b21c9ebf8a /src | |
| parent | 932748db6dd2a7225c9f12bc34339fcb2f37c319 (diff) | |
| parent | 4ad12dd44e3beb1a6a4fc74e2ccb5e3df42cf7c5 (diff) | |
Merge pull request #1167 from SaberUK/master+collision
Rename vague build environment variables to prevent collisions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/coremods/core_info/cmd_modules.cpp | 2 | ||||
| -rw-r--r-- | src/modmanager_dynamic.cpp | 2 | ||||
| -rw-r--r-- | src/modmanager_static.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/coremods/core_info/cmd_modules.cpp b/src/coremods/core_info/cmd_modules.cpp index 5f02d071f..ef1ee7dbe 100644 --- a/src/coremods/core_info/cmd_modules.cpp +++ b/src/coremods/core_info/cmd_modules.cpp @@ -64,7 +64,7 @@ CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, Us if (!(V.Flags & mult)) flags[pos] = '-'; -#ifdef PURE_STATIC +#ifdef INSPIRCD_STATIC user->WriteRemoteNumeric(702, InspIRCd::Format("%s %s :%s", m->ModuleSourceFile.c_str(), flags.c_str(), V.description.c_str())); #else std::string srcrev = m->ModuleDLLManager->GetVersion(); diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp index 9a687ad2b..9e940cc32 100644 --- a/src/modmanager_dynamic.cpp +++ b/src/modmanager_dynamic.cpp @@ -25,7 +25,7 @@ #include <dirent.h> #endif -#ifndef PURE_STATIC +#ifndef INSPIRCD_STATIC bool ModuleManager::Load(const std::string& modname, bool defer) { diff --git a/src/modmanager_static.cpp b/src/modmanager_static.cpp index 98ed26c67..5c04a7680 100644 --- a/src/modmanager_static.cpp +++ b/src/modmanager_static.cpp @@ -23,7 +23,7 @@ #include "exitcodes.h" #include <iostream> -#ifdef PURE_STATIC +#ifdef INSPIRCD_STATIC typedef std::map<std::string, AllModuleList*> modmap; static std::vector<AllCommandList::fn>* cmdlist = NULL; |