Advanced to RC1

[user/henk/code/inspircd.git] / src / dynamic.cpp

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 2e787f341de75c52a0eca9926856586702cea7b2..1def9b5828f72bb4114fdf3bba1a7b8c2eea9c34 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -16,8 +16,8 @@
 
 using namespace std;
 
-#include "globals.h"
 #include "inspircd_config.h"
+#include "globals.h"
 #include "dynamic.h"
 
 #ifndef STATIC_LINK
@@ -29,7 +29,7 @@ using namespace std;
 #include "inspstring.h"
 #include "helperfuncs.h"
 
-DLLManager::DLLManager(const char *fname)
+DLLManager::DLLManager(char *fname)
 {
 #ifdef STATIC_LINK
        this->staticname[0] = '\0';
@@ -50,7 +50,7 @@ DLLManager::DLLManager(const char *fname)
     // Try to open the library now and get any error message.
        
        h = dlopen( fname, RTLD_NOW );
-       err = dlerror();
+       err = (char*)dlerror();
 #endif
 }
 
@@ -67,7 +67,7 @@ DLLManager::~DLLManager()
 
 #ifdef STATIC_LINK
 
-bool DLLManager::GetSymbol(initfunc* &v, const char *sym_name)
+bool DLLManager::GetSymbol(initfunc* &v, char *sym_name)
 {
        log(DEBUG,"Symbol search...");
        for (int j = 0; modsyms[j].name; j++)
@@ -86,7 +86,7 @@ bool DLLManager::GetSymbol(initfunc* &v, const char *sym_name)
 
 #else
 
-bool DLLManager::GetSymbol(void **v, const char *sym_name)
+bool DLLManager::GetSymbol(void **v, char *sym_name)
 {
        // try extract a symbol from the library
        // get any error message is there is any
@@ -94,7 +94,7 @@ bool DLLManager::GetSymbol(void **v, const char *sym_name)
        if(h != 0)
        {
                *v = dlsym( h, sym_name );
-               err = dlerror();
+               err = (char*)dlerror();
                if( err == 0 )
                        return true;
                else
@@ -108,7 +108,7 @@ bool DLLManager::GetSymbol(void **v, const char *sym_name)
 
 #endif
 
-DLLFactoryBase::DLLFactoryBase(const char *fname, const char *factory) : DLLManager(fname)
+DLLFactoryBase::DLLFactoryBase(char *fname, char *factory) : DLLManager(fname)
 {
        // try get the factory function if there is no error yet
        
@@ -117,9 +117,9 @@ DLLFactoryBase::DLLFactoryBase(const char *fname, const char *factory) : DLLMana
        if(LastError() == 0)
        {
 #ifdef STATIC_LINK
-               GetSymbol( factory_func, factory ? factory : "init_module" );
+               GetSymbol( factory_func, factory ? factory : (char*)"init_module" );
 #else
-               GetSymbol( (void **)&factory_func, factory ? factory : "init_module" );
+               GetSymbol( (void **)&factory_func, factory ? factory : (char*)"init_module" );
 #endif
        }
 }