diff options
| author | Peter Powell <petpow@saberuk.com> | 2018-02-17 17:12:26 +0000 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2018-02-17 17:12:26 +0000 |
| commit | d2efdbf6bb91229d043303b1694fefae79ea6fe7 (patch) | |
| tree | bc256da2d24eaf978af4a04cd45f79045c0b745d /include | |
| parent | 36e6dc7bc8c21db2f8fa63c96b3e3aa23886e056 (diff) | |
Fix building on Windows (mostly).
Diffstat (limited to 'include')
| -rw-r--r-- | include/modules.h | 22 | ||||
| -rw-r--r-- | include/modules/shun.h | 2 | ||||
| -rw-r--r-- | include/modules/sql.h | 2 |
3 files changed, 2 insertions, 24 deletions
diff --git a/include/modules.h b/include/modules.h index c6b10cad9..a5e546149 100644 --- a/include/modules.h +++ b/include/modules.h @@ -1216,35 +1216,13 @@ struct AllModuleList { * and functions needed to make a module loadable by the OS. * It defines the class factory and external init_module function. */ -#ifdef _WIN32 - #define MODULE_INIT(y) \ extern "C" DllExport Module * MODULE_INIT_SYM() \ { \ return new y; \ } \ - BOOLEAN WINAPI DllMain(HINSTANCE hDllHandle, DWORD nReason, LPVOID Reserved) \ - { \ - switch ( nReason ) \ - { \ - case DLL_PROCESS_ATTACH: \ - case DLL_PROCESS_DETACH: \ - break; \ - } \ - return TRUE; \ - } \ extern "C" DllExport const char inspircd_src_version[] = INSPIRCD_VERSION; -#else - -#define MODULE_INIT(y) \ - extern "C" DllExport Module * MODULE_INIT_SYM() \ - { \ - return new y; \ - } \ - extern "C" DllExport const char inspircd_src_version[] = INSPIRCD_VERSION; -#endif - #define COMMAND_INIT(c) MODULE_INIT(CommandModule<c>) #endif diff --git a/include/modules/shun.h b/include/modules/shun.h index f2bc4eea5..9ce547e2d 100644 --- a/include/modules/shun.h +++ b/include/modules/shun.h @@ -23,7 +23,7 @@ /** Shun class */ -class CoreExport Shun : public XLine +class Shun : public XLine { public: /** Create a Shun. diff --git a/include/modules/sql.h b/include/modules/sql.h index 01adbb42e..14cd60a56 100644 --- a/include/modules/sql.h +++ b/include/modules/sql.h @@ -42,7 +42,7 @@ namespace SQL enum ErrorCode { /** No error has occurred. */ - NO_ERROR, + SUCCESS, /** The database identifier is invalid. */ BAD_DBID, |