diff options
130 files changed, 140 insertions, 140 deletions
diff --git a/include/services.h b/include/services.h index e0ec8a609..a6469419b 100644 --- a/include/services.h +++ b/include/services.h @@ -192,11 +192,11 @@ extern int strncasecmp(const char *, const char *, size_t); * It defines the class factory and external init_module function. */ #ifdef _WIN32 - #define MODULE_INIT(x, y) \ + #define MODULE_INIT(x) \ extern "C" DllExport Module *init_module(const std::string &, const std::string &); \ - extern "C" Module *init_module(const std::string &, const std::string &creator) \ + extern "C" Module *init_module(const std::string &modname, const std::string &creator) \ { \ - return new y(x, creator); \ + return new x(modname, creator); \ } \ BOOLEAN WINAPI DllMain(HINSTANCE, DWORD nReason, LPVOID) \ { \ @@ -208,19 +208,19 @@ extern int strncasecmp(const char *, const char *, size_t); } \ return TRUE; \ } \ - extern "C" DllExport void destroy_module(y *); \ - extern "C" void destroy_module(y *m) \ + extern "C" DllExport void destroy_module(x *); \ + extern "C" void destroy_module(x *m) \ { \ delete m; \ } #else - #define MODULE_INIT(x, y) \ - extern "C" DllExport Module *init_module(const std::string &, const std::string &creator) \ + #define MODULE_INIT(x) \ + extern "C" DllExport Module *init_module(const std::string &modname, const std::string &creator) \ { \ - return new y(x, creator); \ + return new x(modname, creator); \ } \ - extern "C" DllExport void destroy_module(y *m) \ + extern "C" DllExport void destroy_module(x *m) \ { \ delete m; \ } diff --git a/src/core/bs_act.c b/src/core/bs_act.c index 82c893e74..13ef27a23 100644 --- a/src/core/bs_act.c +++ b/src/core/bs_act.c @@ -83,4 +83,4 @@ class BSAct : public Module } }; -MODULE_INIT("bs_act", BSAct) +MODULE_INIT(BSAct) diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c index e54989ac7..1ca280c4c 100644 --- a/src/core/bs_assign.c +++ b/src/core/bs_assign.c @@ -94,4 +94,4 @@ class BSAssign : public Module } }; -MODULE_INIT("bs_assign", BSAssign) +MODULE_INIT(BSAssign) diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c index b8a022f1b..8c07fb36a 100644 --- a/src/core/bs_badwords.c +++ b/src/core/bs_badwords.c @@ -354,4 +354,4 @@ int badwords_list_callback(User * u, int num, va_list args) return badwords_list(u, num - 1, ci, sent_header); } -MODULE_INIT("bs_badwords", BSBadwords) +MODULE_INIT(BSBadwords) diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index 6cb46f2ba..6c6c83ea1 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -441,4 +441,4 @@ class BSBot : public Module } }; -MODULE_INIT("bs_bot", BSBot) +MODULE_INIT(BSBot) diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c index 71ee10af0..79902a752 100644 --- a/src/core/bs_botlist.c +++ b/src/core/bs_botlist.c @@ -86,4 +86,4 @@ class BSBotList : public Module } }; -MODULE_INIT("bs_botlist", BSBotList) +MODULE_INIT(BSBotList) diff --git a/src/core/bs_help.c b/src/core/bs_help.c index 2fdc9adac..e76943636 100644 --- a/src/core/bs_help.c +++ b/src/core/bs_help.c @@ -53,4 +53,4 @@ class BSHelp : public Module -MODULE_INIT("bs_help", BSHelp) +MODULE_INIT(BSHelp) diff --git a/src/core/bs_info.c b/src/core/bs_info.c index 8ebdf6e46..cb1590719 100644 --- a/src/core/bs_info.c +++ b/src/core/bs_info.c @@ -264,4 +264,4 @@ class BSInfo : public Module } }; -MODULE_INIT("bs_info", BSInfo) +MODULE_INIT(BSInfo) diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c index 95a0a63b0..38fc51923 100644 --- a/src/core/bs_kick.c +++ b/ |