diff options
| -rw-r--r-- | include/modules.h | 47 | ||||
| -rw-r--r-- | src/module.cpp | 6 | ||||
| -rw-r--r-- | src/modulemanager.cpp | 6 | ||||
| -rw-r--r-- | src/modules.c | 19 |
4 files changed, 33 insertions, 45 deletions
diff --git a/include/modules.h b/include/modules.h index fc60290b3..6564f0fbd 100644 --- a/include/modules.h +++ b/include/modules.h @@ -69,20 +69,20 @@ typedef void * ano_module_t; /********************************************************************** * Module Returns **********************************************************************/ - #define MOD_ERR_OK 0 - #define MOD_ERR_MEMORY 1 - #define MOD_ERR_PARAMS 2 - #define MOD_ERR_EXISTS 3 - #define MOD_ERR_NOEXIST 4 - #define MOD_ERR_NOUSER 5 - #define MOD_ERR_NOLOAD 6 - #define MOD_ERR_NOUNLOAD 7 - #define MOD_ERR_SYNTAX 8 - #define MOD_ERR_NODELETE 9 - #define MOD_ERR_UNKNOWN 10 - #define MOD_ERR_FILE_IO 11 - #define MOD_ERR_NOSERVICE 12 - #define MOD_ERR_NO_MOD_NAME 13 +#define MOD_ERR_OK 0 +#define MOD_ERR_MEMORY 1 +#define MOD_ERR_PARAMS 2 +#define MOD_ERR_EXISTS 3 +#define MOD_ERR_NOEXIST 4 +#define MOD_ERR_NOUSER 5 +#define MOD_ERR_NOLOAD 6 +#define MOD_ERR_NOUNLOAD 7 +#define MOD_ERR_SYNTAX 8 +#define MOD_ERR_NODELETE 9 +#define MOD_ERR_UNKNOWN 10 +#define MOD_ERR_FILE_IO 11 +#define MOD_ERR_NOSERVICE 12 +#define MOD_ERR_NO_MOD_NAME 13 /*************************************************************************/ /* Macros to export the Module API functions/variables */ @@ -97,6 +97,25 @@ typedef void * ano_module_t; #endif /*************************************************************************/ +#if !defined(_WIN32) + #include <dlfcn.h> + /* Define these for systems without them */ + #ifndef RTLD_NOW + #define RTLD_NOW 0 + #endif + #ifndef RTLD_LAZY + #define RTLD_LAZY RTLD_NOW + #endif + #ifndef RTLD_GLOBAL + #define RTLD_GLOBAL 0 + #endif + #ifndef RTLD_LOCAL + #define RTLD_LOCAL 0 + #endif +#else + const char *ano_moderr(void); +#endif + typedef enum { CORE,PROTOCOL,THIRD,SUPPORTED,QATESTED,ENCRYPTION } MODType; typedef enum { MOD_OP_LOAD, MOD_OP_UNLOAD } ModuleOperation; diff --git a/src/module.cpp b/src/module.cpp index 9c86ec299..18b22180e 100644 --- a/src/module.cpp +++ b/src/module.cpp @@ -12,12 +12,6 @@ #include "language.h" #include "version.h" -#if !defined(_WIN32) - #include <dlfcn.h> -#else - const char *ano_moderr(void); -#endif - Module::Module(const std::string &mname, const std::string &creator) { this->name = mname; /* Our name */ diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp index 8ce6ce953..edccd8dc5 100644 --- a/src/modulemanager.cpp +++ b/src/modulemanager.cpp @@ -12,12 +12,6 @@ #include "language.h" #include "version.h" -#if !defined(_WIN32) - #include <dlfcn.h> -#else - const char *ano_moderr(void); -#endif - void ModuleManager::LoadModuleList(int total_modules, char **module_list) { int idx; diff --git a/src/modules.c b/src/modules.c index aa8f09b29..9c5d7d3ff 100644 --- a/src/modules.c +++ b/src/modules.c @@ -15,25 +15,6 @@ #include "language.h" #include "version.h" -#if !defined(_WIN32) - #include <dlfcn.h> - /* Define these for systems without them */ - #ifndef RTLD_NOW - #define RTLD_NOW 0 - #endif - #ifndef RTLD_LAZY - #define RTLD_LAZY RTLD_NOW - #endif - #ifndef RTLD_GLOBAL - #define RTLD_GLOBAL 0 - #endif - #ifndef RTLD_LOCAL - #define RTLD_LOCAL 0 - #endif -#else - const char *ano_moderr(void); -#endif - /** * Declare all the list's we want to use here **/ |