5 files changed, 5 insertions, 108 deletions
diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp
index d48da1703..391e4bbba 100644
--- a/src/modules/extra/m_sqllog.cpp
+++ b/src/modules/extra/m_sqllog.cpp
@@ -306,26 +306,5 @@ class ModuleSQLLog : public Module
 	
 };
 
-class ModuleSQLLogFactory : public ModuleFactory
-{
- public:
-	ModuleSQLLogFactory()
-	{
-	}
-	
-	~ModuleSQLLogFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSQLLog(Me);
-	}
-	
-};
-
+MODULE_INIT(ModuleSQLLog);
 
-extern "C" void * init_module( void )
-{
-	return new ModuleSQLLogFactory;
-}
diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index c6ce500e6..520869e21 100644
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -279,27 +279,5 @@ public:
 	
 };
 
-class ModuleSQLOperFactory : public ModuleFactory
-{
- public:
-	ModuleSQLOperFactory()
-	{
-	}
-	
-	~ModuleSQLOperFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSQLOper(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSQLOperFactory;
-}
+MODULE_INIT(ModuleSQLOper);
 
diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp
index 8c7cebd1b..b470f99af 100644
--- a/src/modules/extra/m_sqlutils.cpp
+++ b/src/modules/extra/m_sqlutils.cpp
@@ -234,25 +234,5 @@ public:
 	
 };
 
-class ModuleSQLutilsFactory : public ModuleFactory
-{
- public:
-	ModuleSQLutilsFactory()
-	{
-	}
-	
-	~ModuleSQLutilsFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSQLutils(Me);
-	}
-};
-
+MODULE_INIT(ModuleSQLutils);
 
-extern "C" void * init_module( void )
-{
-	return new ModuleSQLutilsFactory;
-}
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index fec0b498d..8c08fb80b 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -822,25 +822,5 @@ class ModuleSSLGnuTLS : public Module
 
 };
 
-class ModuleSSLGnuTLSFactory : public ModuleFactory
-{
- public:
-	ModuleSSLGnuTLSFactory()
-	{
-	}
-
-	~ModuleSSLGnuTLSFactory()
-	{
-	}
+MODULE_INIT(ModuleSSLGnuTLS);
 
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSSLGnuTLS(Me);
-	}
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSSLGnuTLSFactory;
-}
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 9012aaa37..943d88843 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -843,25 +843,5 @@ static int error_callback(const char *str, size_t len, void *u)
 	return 0;
 }
 
-class ModuleSSLOpenSSLFactory : public ModuleFactory
-{
- public:
-	ModuleSSLOpenSSLFactory()
-	{
-	}
-
-	~ModuleSSLOpenSSLFactory()
-	{
-	}
+MODULE_INIT(ModuleSSLOpenSSL);
 
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSSLOpenSSL(Me);
-	}
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSSLOpenSSLFactory;
-}