From 24b881c427a0f3b07709bb2b81c8d2a574142d81 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 23 Dec 2022 15:09:12 +0000 Subject: [PATCH] Update MODULE_INIT for modern MSVC+ versions. --- include/modules.h | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/include/modules.h b/include/modules.h index f7956ecab..a13d56195 100644 --- a/include/modules.h +++ b/include/modules.h @@ -24,32 +24,7 @@ * and functions needed to make a module loadable by the OS. * It defines the class factory and external AnopeInit and AnopeFini functions. */ -#ifdef _WIN32 -# define MODULE_INIT(x) \ - extern "C" DllExport Module *AnopeInit(const Anope::string &, const Anope::string &); \ - extern "C" Module *AnopeInit(const Anope::string &modname, const Anope::string &creator) \ - { \ - return new x(modname, creator); \ - } \ - BOOLEAN WINAPI DllMain(HINSTANCE, DWORD, LPVOID) \ - { \ - return TRUE; \ - } \ - extern "C" DllExport void AnopeFini(x *); \ - extern "C" void AnopeFini(x *m) \ - { \ - delete m; \ - } \ - extern "C" DllExport ModuleVersionC AnopeVersion() \ - { \ - ModuleVersionC ver; \ - ver.version_major = VERSION_MAJOR; \ - ver.version_minor = VERSION_MINOR; \ - ver.version_patch = VERSION_PATCH; \ - return ver; \ - } -#else -# define MODULE_INIT(x) \ +#define MODULE_INIT(x) \ extern "C" DllExport Module *AnopeInit(const Anope::string &modname, const Anope::string &creator) \ { \ return new x(modname, creator); \ @@ -66,7 +41,6 @@ ver.version_patch = VERSION_PATCH; \ return ver; \ } -#endif /** * This #define allows us to call a method in all