Update all MOD_TEST/MOD_INIT/MOD_LOAD/MOD_UNLOAD calls to new format

src/modules/blacklist.c

@@ -101,14 +101,14 @@ void blacklist_free_bluser_if_able(BLUser *bl);
 #define SetBLUser(x, y)	do { moddata_client(x, blacklist_md).ptr = y; } while(0)
 #define BLUSER(x)	((BLUser *)moddata_client(x, blacklist_md).ptr)
 
-DLLFUNC int MOD_TEST(blacklist)(ModuleInfo *modinfo)
+MOD_TEST(blacklist)
 {
 	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, blacklist_config_test);
 	return MOD_SUCCESS;
 }
 
 /** Called upon module init */
-DLLFUNC int MOD_INIT(blacklist)(ModuleInfo *modinfo)
+MOD_INIT(blacklist)
 {
 	ModDataInfo mreq;
 
@@ -136,13 +136,13 @@ DLLFUNC int MOD_INIT(blacklist)(ModuleInfo *modinfo)
 }
 
 /** Called upon module load */
-DLLFUNC int MOD_LOAD(blacklist)(int module_load)
+MOD_LOAD(blacklist)
 {
 	return MOD_SUCCESS;
 }
 
 /** Called upon unload */
-DLLFUNC int MOD_UNLOAD(blacklist)(int module_unload)
+MOD_UNLOAD(blacklist)
 {
 	blacklist_free_conf();
 	return MOD_SUCCESS;

src/modules/cap_invitenotify.c

@@ -68,7 +68,7 @@ static void cap_invitenotify_invite(aClient *from, aClient *to, aChannel *chptr)
 }
 
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(cap_invitenotify)(ModuleInfo *modinfo)
+MOD_INIT(cap_invitenotify)
 {
         MARK_AS_OFFICIAL_MODULE(modinfo);
 
@@ -79,13 +79,13 @@ DLLFUNC int MOD_INIT(cap_invitenotify)(ModuleInfo *modinfo)
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(cap_invitenotify)(int module_load)
+MOD_LOAD(cap_invitenotify)
 {
         return MOD_SUCCESS;
 }
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(cap_invitenotify)(int module_unload)
+MOD_UNLOAD(cap_invitenotify)
 {
         return MOD_SUCCESS;
 }

src/modules/certfp.c

@@ -31,7 +31,7 @@ ModDataInfo *certfp_md; /* Module Data structure which we acquire */
 
 #define WHOISCERTFP_STRING ":%s 276 %s %s :has client certificate fingerprint %s"
 
-DLLFUNC int MOD_INIT(certfp)(ModuleInfo *modinfo)
+MOD_INIT(certfp)
 {
 ModDataInfo mreq;
 
@@ -54,13 +54,13 @@ ModDataInfo mreq;
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(certfp)(int module_load)
+MOD_LOAD(certfp)
 {
 	return MOD_SUCCESS;
 }
 
 
-DLLFUNC int MOD_UNLOAD(certfp)(int module_unload)
+MOD_UNLOAD(certfp)
 {
 	return MOD_SUCCESS;
 }

src/modules/chanmodes/censor.c

@@ -53,13 +53,13 @@ ModuleInfo *ModInfo = NULL;
 ConfigItem_badword *conf_badword_channel = NULL;
 
 
-DLLFUNC int MOD_TEST(censor)(ModuleInfo *modinfo)
+MOD_TEST(censor)
 {
 	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, censor_config_test);
 	return MOD_SUCCESS;
 }
 	
-DLLFUNC int MOD_INIT(censor)(ModuleInfo *modinfo)
+MOD_INIT(censor)
 {
 	CmodeInfo req;
 
@@ -81,13 +81,13 @@ DLLFUNC int MOD_INIT(censor)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(censor)(int module_load)
+MOD_LOAD(censor)
 {
 	return MOD_SUCCESS;
 }
 
 
-DLLFUNC int MOD_UNLOAD(censor)(int module_unload)
+MOD_UNLOAD(censor)
 {
 ConfigItem_badword *badword, *next;
 

src/modules/chanmodes/delayjoin.c

@@ -36,7 +36,7 @@ DLLFUNC int moded_chanmsg(aClient *sptr, aChannel *chptr, char *text, int notice
 char *moded_serialize(ModData *m);
 void moded_unserialize(char *str, ModData *m);
 
-DLLFUNC int MOD_INIT(delayjoin)(ModuleInfo *modinfo)
+MOD_INIT(delayjoin)
 {
 
 	CmodeInfo req;
@@ -84,12 +84,12 @@ DLLFUNC int MOD_INIT(delayjoin)(ModuleInfo *modinfo)
         return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(delayjoin)(int module_load)
+MOD_LOAD(delayjoin)
 {
         return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(delayjoin)(int module_unload)
+MOD_UNLOAD(delayjoin)
 {
         return MOD_SUCCESS;
 }

src/modules/chanmodes/floodprot.c

@@ -114,7 +114,7 @@ int floodprot_remote_nickchange(aClient *cptr, aClient *sptr, char *oldnick);
 int floodprot_chanmode_del(aChannel *chptr, int m);
 void userfld_free(ModData *md);
 
-DLLFUNC int MOD_INIT(floodprot)(ModuleInfo *modinfo)
+MOD_INIT(floodprot)
 {
 	CmodeInfo creq;
 	ModDataInfo mreq;
@@ -156,14 +156,14 @@ DLLFUNC int MOD_INIT(floodprot)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(floodprot)(int module_load)
+MOD_LOAD(floodprot)
 {
 	EventAddEx(ModInfo->handle, "modef_event", 10, 0, modef_event, NULL);
 	return MOD_SUCCESS;
 }
 
 
-DLLFUNC int MOD_UNLOAD(floodprot)(int module_unload)
+MOD_UNLOAD(floodprot)
 {
 	return MOD_FAILED;
 }

src/modules/chanmodes/issecure.c

@@ -71,12 +71,12 @@ DLLFUNC int issecure_chanmode(aClient *cptr, aClient *sptr, aChannel *chptr,
                              char *modebuf, char *parabuf, int sendts, int samode);
                              
 
-DLLFUNC int MOD_TEST(issecure)(ModuleInfo *modinfo)
+MOD_TEST(issecure)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(issecure)(ModuleInfo *modinfo)
+MOD_INIT(issecure)
 {
 CmodeInfo req;
 
@@ -103,12 +103,12 @@ CmodeInfo req;
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(issecure)(int module_load)
+MOD_LOAD(issecure)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(issecure)(int module_unload)
+MOD_UNLOAD(issecure)
 {
 	return MOD_SUCCESS;
 }

src/modules/chanmodes/link.c

@@ -51,7 +51,7 @@ int cmodeL_sjoin_check(aChannel *chptr, void *ourx, void *theirx);
 
 int link_can_join_limitexceeded(aClient *sptr, aChannel *chptr, char *key, char *link, char *parv[]);
 
-DLLFUNC int MOD_INIT(link)(ModuleInfo *modinfo)
+MOD_INIT(link)
 {
 	CmodeInfo req;
 	ModuleSetOptions(modinfo->handle, MOD_OPT_PERM_RELOADABLE, 1);
@@ -73,13 +73,13 @@ DLLFUNC int MOD_INIT(link)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(link)(int module_load)
+MOD_LOAD(link)
 {
 	return MOD_SUCCESS;
 }
 
 
-DLLFUNC int MOD_UNLOAD(link)(int module_unload)
+MOD_UNLOAD(link)
 {
 	return MOD_SUCCESS;
 }

src/modules/chanmodes/nocolor.c

@@ -58,12 +58,12 @@ DLLFUNC char *nocolor_prechanmsg(aClient *sptr, aChannel *chptr, char *text, int
 DLLFUNC char *nocolor_prelocalpart(aClient *sptr, aChannel *chptr, char *comment);
 DLLFUNC char *nocolor_prelocalquit(aClient *sptr, char *comment);
 
-DLLFUNC int MOD_TEST(nocolor)(ModuleInfo *modinfo)
+MOD_TEST(nocolor)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(nocolor)(ModuleInfo *modinfo)
+MOD_INIT(nocolor)
 {
 CmodeInfo req;
 
@@ -82,12 +82,12 @@ CmodeInfo req;
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(nocolor)(int module_load)
+MOD_LOAD(nocolor)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(nocolor)(int module_unload)
+MOD_UNLOAD(nocolor)
 {
 	return MOD_SUCCESS;
 }

src/modules/chanmodes/noctcp.c

@@ -56,12 +56,12 @@ Cmode_t EXTCMODE_NOCTCP;
 
 DLLFUNC char *noctcp_prechanmsg(aClient *sptr, aChannel *chptr, char *text, int notice);
 
-DLLFUNC int MOD_TEST(noctcp)(ModuleInfo *modinfo)
+MOD_TEST(noctcp)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(noctcp)(ModuleInfo *modinfo)
+MOD_INIT(noctcp)
 {
 CmodeInfo req;
 
@@ -77,12 +77,12 @@ CmodeInfo req;
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(noctcp)(int module_load)
+MOD_LOAD(noctcp)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(noctcp)(int module_unload)
+MOD_UNLOAD(noctcp)
 {
 	return MOD_SUCCESS;
 }

src/modules/chanmodes/noinvite.c

@@ -56,12 +56,12 @@ Cmode_t EXTCMODE_NOINVITE;
 
 DLLFUNC int noinvite_check (aClient *sptr, aChannel *chptr);
 
-DLLFUNC int MOD_TEST(noinvite)(ModuleInfo *modinfo)
+MOD_TEST(noinvite)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(noinvite)(ModuleInfo *modinfo)
+MOD_INIT(noinvite)
 {
 	CmodeInfo req;
 
@@ -78,12 +78,12 @@ DLLFUNC int MOD_INIT(noinvite)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(noinvite)(int module_load)
+MOD_LOAD(noinvite)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(noinvite)(int module_unload)
+MOD_UNLOAD(noinvite)
 {
 	return MOD_SUCCESS;
 }

src/modules/chanmodes/nokick.c

@@ -55,12 +55,12 @@ Cmode_t EXTCMODE_NOKICK;
 
 int nokick_check (aClient* sptr, aClient* who, aChannel *chptr, char* comment, long sptr_flags, long who_flags, char **reject_reason);
 
-DLLFUNC int MOD_TEST(nokick)(ModuleInfo *modinfo)
+MOD_TEST(nokick)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(nokick)(ModuleInfo *modinfo)
+MOD_INIT(nokick)
 {
 	CmodeInfo req;
 
@@ -77,12 +77,12 @@ DLLFUNC int MOD_INIT(nokick)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(nokick)(int module_load)
+MOD_LOAD(nokick)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(nokick)(int module_unload)
+MOD_UNLOAD(nokick)
 {
 	return MOD_SUCCESS;
 }

src/modules/chanmodes/noknock.c

@@ -56,12 +56,12 @@ DLLFUNC int noknock_check (aClient *sptr, aChannel *chptr);
 DLLFUNC int noknock_mode_allow(aClient *cptr, aChannel *chptr, char mode, char *para, int checkt, int what);
 DLLFUNC int noknock_mode_del (aChannel *chptr, int modeChar);
 
-DLLFUNC int MOD_TEST(noknock)(ModuleInfo *modinfo)
+MOD_TEST(noknock)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(noknock)(ModuleInfo *modinfo)
+MOD_INIT(noknock)
 {
 CmodeInfo req;
 
@@ -79,12 +79,12 @@ CmodeInfo req;
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(noctcp)(int module_load)
+MOD_LOAD(noctcp)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(noctcp)(int module_unload)
+MOD_UNLOAD(noctcp)
 {
 	return MOD_SUCCESS;
 }

src/modules/chanmodes/nonickchange.c

@@ -55,12 +55,12 @@ Cmode_t EXTCMODE_NONICKCHANGE;
 
 DLLFUNC int nonickchange_check (aClient *sptr, aChannel *chptr);
 
-DLLFUNC int MOD_TEST(nonickchange)(ModuleInfo *modinfo)
+MOD_TEST(nonickchange)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(nonickchange)(ModuleInfo *modinfo)
+MOD_INIT(nonickchange)
 {
 CmodeInfo req;
 
@@ -77,12 +77,12 @@ CmodeInfo req;
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(nonickchange)(int module_load)
+MOD_LOAD(nonickchange)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(nonickchange)(int module_unload)
+MOD_UNLOAD(nonickchange)
 {
 	return MOD_SUCCESS;
 }

src/modules/chanmodes/nonotice.c

@@ -54,12 +54,12 @@ Cmode_t EXTCMODE_NONOTICE;
 
 int nonotice_check_can_send(aClient *cptr, aChannel *chptr, char *msgtext, Membership *lp, int notice);
 
-DLLFUNC int MOD_TEST(nonotice)(ModuleInfo *modinfo)
+MOD_TEST(nonotice)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(nonotice)(ModuleInfo *modinfo)
+MOD_INIT(nonotice)
 {
 	CmodeInfo req;
 
@@ -75,12 +75,12 @@ DLLFUNC int MOD_INIT(nonotice)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(nonotice)(int module_load)
+MOD_LOAD(nonotice)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(nonotice)(int module_unload)
+MOD_UNLOAD(nonotice)
 {
 	return MOD_SUCCESS;
 }

src/modules/chanmodes/operonly.c

@@ -57,12 +57,12 @@ DLLFUNC int operonly_check (aClient *cptr, aChannel *chptr, char *key, char *par
 DLLFUNC int operonly_topic_allow (aClient *sptr, aChannel *chptr);
 DLLFUNC int operonly_check_ban(aClient *cptr, aChannel *chptr);
 
-DLLFUNC int MOD_TEST(operonly)(ModuleInfo *modinfo)
+MOD_TEST(operonly)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(operonly)(ModuleInfo *modinfo)
+MOD_INIT(operonly)
 {
 CmodeInfo req;
 
@@ -81,12 +81,12 @@ CmodeInfo req;
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(noctcp)(int module_load)
+MOD_LOAD(noctcp)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(noctcp)(int module_unload)
+MOD_UNLOAD(noctcp)
 {
 	return MOD_SUCCESS;
 }

src/modules/chanmodes/permanent.c

@@ -48,7 +48,7 @@ static int permanent_is_ok(aClient *cptr, aChannel *chptr, char mode, char *para
 }
 
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(permanent)(ModuleInfo *modinfo)
+MOD_INIT(permanent)
 {
 CmodeInfo req;
 
@@ -66,13 +66,13 @@ CmodeInfo req;
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(permanent)(int module_load)
+MOD_LOAD(permanent)
 {
         return MOD_SUCCESS;
 }
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(permanent)(int module_unload)
+MOD_UNLOAD(permanent)
 {
         return MOD_SUCCESS;
 }

src/modules/chanmodes/regonly.c

@@ -56,12 +56,12 @@ Cmode_t EXTCMODE_REGONLY;
 DLLFUNC int regonly_check (aClient *cptr, aChannel *chptr, char *key, char *parv[]);
 
 
-DLLFUNC int MOD_TEST(regonly)(ModuleInfo *modinfo)
+MOD_TEST(regonly)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(regonly)(ModuleInfo *modinfo)
+MOD_INIT(regonly)
 {
 CmodeInfo req;
 
@@ -78,12 +78,12 @@ CmodeInfo req;
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(regonly)(int module_load)
+MOD_LOAD(regonly)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(regonly)(int module_unload)
+MOD_UNLOAD(regonly)
 {
 	return MOD_SUCCESS;
 }

src/modules/chanmodes/regonlyspeak.c

@@ -57,12 +57,12 @@ static char errMsg[2048];
 DLLFUNC int regonlyspeak_can_send (aClient* cptr, aChannel *chptr, char* message, Membership* lp, int notice);
 DLLFUNC char * regonlyspeak_part_message (aClient* sptr, aChannel *chptr, char* comment);
 
-DLLFUNC int MOD_TEST(regonlyspeak)(ModuleInfo *modinfo)
+MOD_TEST(regonlyspeak)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(regonlyspeak)(ModuleInfo *modinfo)
+MOD_INIT(regonlyspeak)
 {
 	CmodeInfo req;
 
@@ -80,12 +80,12 @@ DLLFUNC int MOD_INIT(regonlyspeak)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(regonlyspeak)(int module_load)
+MOD_LOAD(regonlyspeak)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(regonlyspeak)(int module_unload)
+MOD_UNLOAD(regonlyspeak)
 {
 	return MOD_SUCCESS;
 }

src/modules/chanmodes/secureonly.c

@@ -58,12 +58,12 @@ int secureonly_check_send (aClient *acptr, aChannel* chptr);
 int secureonly_check_secure (aChannel* chptr);
 int secureonly_check_sajoin (aClient *acptr, aChannel* chptr, aClient *sptr);
 
-DLLFUNC int MOD_TEST(sslonly)(ModuleInfo *modinfo)
+MOD_TEST(sslonly)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(sslonly)(ModuleInfo *modinfo)
+MOD_INIT(sslonly)
 {
 	CmodeInfo req;
 
@@ -84,12 +84,12 @@ DLLFUNC int MOD_INIT(sslonly)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(sslonly)(int module_load)
+MOD_LOAD(sslonly)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(sslonly)(int module_unload)
+MOD_UNLOAD(sslonly)
 {
 	return MOD_SUCCESS;
 }

src/modules/chanmodes/stripcolor.c

@@ -58,12 +58,12 @@ DLLFUNC char *stripcolor_prechanmsg(aClient *sptr, aChannel *chptr, char *text,
 DLLFUNC char *stripcolor_prelocalpart(aClient *sptr, aChannel *chptr, char *comment);
 DLLFUNC char *stripcolor_prelocalquit(aClient *sptr, char *comment);
 
-DLLFUNC int MOD_TEST(stripcolor)(ModuleInfo *modinfo)
+MOD_TEST(stripcolor)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(stripcolor)(ModuleInfo *modinfo)
+MOD_INIT(stripcolor)
 {
 CmodeInfo req;
 
@@ -82,12 +82,12 @@ CmodeInfo req;
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(stripcolor)(int module_load)
+MOD_LOAD(stripcolor)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(stripcolor)(int module_unload)
+MOD_UNLOAD(stripcolor)
 {
 	return MOD_SUCCESS;
 }

src/modules/cloak.c

@@ -74,7 +74,7 @@ ModuleHeader MOD_HEADER(cloak)
   NULL
   };
 
-DLLFUNC int MOD_TEST(cloak)(ModuleInfo *modinfo)
+MOD_TEST(cloak)
 {
 	cloak = CallbackAddPCharEx(modinfo->handle, CALLBACKTYPE_CLOAK, hidehost);
 	if (!cloak)
@@ -93,19 +93,19 @@ DLLFUNC int MOD_TEST(cloak)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(cloak)(ModuleInfo *modinfo)
+MOD_INIT(cloak)
 {
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, cloak_config_run);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(cloak)(int module_load)
+MOD_LOAD(cloak)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(cloak)(int module_unload)
+MOD_UNLOAD(cloak)
 {
 	if (cloak_key1)
 	{

src/modules/extbans/account.c

@@ -32,7 +32,7 @@ char *extban_account_conv_param(char *para);
 int extban_account_is_banned(aClient *sptr, aChannel *chptr, char *banin, int type);
 
 /** Called upon module init */
-DLLFUNC int MOD_INIT(account)(ModuleInfo *modinfo)
+MOD_INIT(account)
 {
 	ExtbanInfo req;
 	
@@ -53,13 +53,13 @@ DLLFUNC int MOD_INIT(account)(ModuleInfo *modinfo)
 }
 
 /** Called upon module load */
-DLLFUNC int MOD_LOAD(account)(int module_load)
+MOD_LOAD(account)
 {
 	return MOD_SUCCESS;
 }
 
 /** Called upon unload */
-DLLFUNC int MOD_UNLOAD(account)(int module_unload)
+MOD_UNLOAD(account)
 {
 	return MOD_SUCCESS;
 }

src/modules/extbans/certfp.c

@@ -33,7 +33,7 @@ char *extban_certfp_conv_param(char *para);
 int extban_certfp_is_banned(aClient *sptr, aChannel *chptr, char *banin, int type);
 
 /* Called upon module init */
-DLLFUNC int MOD_INIT(certfp)(ModuleInfo *modinfo)
+MOD_INIT(certfp)
 {
 	ExtbanInfo req;
 	
@@ -54,13 +54,13 @@ DLLFUNC int MOD_INIT(certfp)(ModuleInfo *modinfo)
 }
 
 /* Called upon module load */
-DLLFUNC int MOD_LOAD(certfp)(int module_load)
+MOD_LOAD(certfp)
 {
 	return MOD_SUCCESS;
 }
 
 /* Called upon unload */
-DLLFUNC int MOD_UNLOAD(account)(int module_unload)
+MOD_UNLOAD(account)
 {
 	return MOD_SUCCESS;
 }

src/modules/extbans/inchannel.c

@@ -33,7 +33,7 @@ char *extban_inchannel_conv_param(char *para);
 int extban_inchannel_is_banned(aClient *sptr, aChannel *chptr, char *banin, int type);
 
 /** Called upon module init */
-DLLFUNC int MOD_INIT(inchannel)(ModuleInfo *modinfo)
+MOD_INIT(inchannel)
 {
 	ExtbanInfo req;
 	
@@ -54,13 +54,13 @@ DLLFUNC int MOD_INIT(inchannel)(ModuleInfo *modinfo)
 }
 
 /** Called upon module load */
-DLLFUNC int MOD_LOAD(inchannel)(int module_load)
+MOD_LOAD(inchannel)
 {
 	return MOD_SUCCESS;
 }
 
 /** Called upon unload */
-DLLFUNC int MOD_UNLOAD(inchannel)(int module_unload)
+MOD_UNLOAD(inchannel)
 {
 	return MOD_SUCCESS;
 }

src/modules/extbans/join.c

@@ -31,7 +31,7 @@ ModuleHeader MOD_HEADER(join)
 int extban_modej_is_banned(aClient *sptr, aChannel *chptr, char *banin, int type);
 
 /** Called upon module init */
-DLLFUNC int MOD_INIT(join)(ModuleInfo *modinfo)
+MOD_INIT(join)
 {
 	ExtbanInfo req;
 	
@@ -52,13 +52,13 @@ DLLFUNC int MOD_INIT(join)(ModuleInfo *modinfo)
 }
 
 /** Called upon module load */
-DLLFUNC int MOD_LOAD(join)(int module_load)
+MOD_LOAD(join)
 {
 	return MOD_SUCCESS;
 }
 
 /** Called upon unload */
-DLLFUNC int MOD_UNLOAD(join)(int module_unload)
+MOD_UNLOAD(join)
 {
 	return MOD_SUCCESS;
 }

src/modules/extbans/nickchange.c

@@ -31,7 +31,7 @@ ModuleHeader MOD_HEADER(nickchange)
 int extban_nickchange_is_banned(aClient *sptr, aChannel *chptr, char *banin, int type);
 
 /** Called upon module init */
-DLLFUNC int MOD_INIT(nickchange)(ModuleInfo *modinfo)
+MOD_INIT(nickchange)
 {
 	ExtbanInfo req;
 	
@@ -52,13 +52,13 @@ DLLFUNC int MOD_INIT(nickchange)(ModuleInfo *modinfo)
 }
 
 /** Called upon module load */
-DLLFUNC int MOD_LOAD(nickchange)(int module_load)
+MOD_LOAD(nickchange)
 {
 	return MOD_SUCCESS;
 }
 
 /** Called upon unload */
-DLLFUNC int MOD_UNLOAD(nickchange)(int module_unload)
+MOD_UNLOAD(nickchange)
 {
 	return MOD_SUCCESS;
 }

src/modules/extbans/operclass.c

@@ -32,7 +32,7 @@ char *extban_operclass_conv_param(char *para);
 int extban_operclass_is_banned(aClient *sptr, aChannel *chptr, char *banin, int type);
 
 /** Called upon module init */
-DLLFUNC int MOD_INIT(operclass)(ModuleInfo *modinfo)
+MOD_INIT(operclass)
 {
 	ExtbanInfo req;
 	
@@ -53,13 +53,13 @@ DLLFUNC int MOD_INIT(operclass)(ModuleInfo *modinfo)
 }
 
 /** Called upon module load */
-DLLFUNC int MOD_LOAD(operclass)(int module_load)
+MOD_LOAD(operclass)
 {
 	return MOD_SUCCESS;
 }
 
 /** Called upon unload */
-DLLFUNC int MOD_UNLOAD(operclass)(int module_unload)
+MOD_UNLOAD(operclass)
 {
 	return MOD_SUCCESS;
 }

src/modules/extbans/quiet.c

@@ -31,7 +31,7 @@ ModuleHeader MOD_HEADER(quiet)
 int extban_quiet_is_banned(aClient *sptr, aChannel *chptr, char *banin, int type);
 
 /** Called upon module init */
-DLLFUNC int MOD_INIT(quiet)(ModuleInfo *modinfo)
+MOD_INIT(quiet)
 {
 	ExtbanInfo req;
 	
@@ -52,13 +52,13 @@ DLLFUNC int MOD_INIT(quiet)(ModuleInfo *modinfo)
 }
 
 /** Called upon module load */
-DLLFUNC int MOD_LOAD(quiet)(int module_load)
+MOD_LOAD(quiet)
 {
 	return MOD_SUCCESS;
 }
 
 /** Called upon unload */
-DLLFUNC int MOD_UNLOAD(quiet)(int module_unload)
+MOD_UNLOAD(quiet)
 {
 	return MOD_SUCCESS;
 }

src/modules/extbans/realname.c

@@ -32,7 +32,7 @@ char *extban_realname_conv_param(char *para);
 int extban_realname_is_banned(aClient *sptr, aChannel *chptr, char *banin, int type);
 
 /** Called upon module init */
-DLLFUNC int MOD_INIT(realname)(ModuleInfo *modinfo)
+MOD_INIT(realname)
 {
 	ExtbanInfo req;
 	
@@ -53,13 +53,13 @@ DLLFUNC int MOD_INIT(realname)(ModuleInfo *modinfo)
 }
 
 /** Called upon module load */
-DLLFUNC int MOD_LOAD(realname)(int module_load)
+MOD_LOAD(realname)
 {
 	return MOD_SUCCESS;
 }
 
 /** Called upon unload */
-DLLFUNC int MOD_UNLOAD(realname)(int module_unload)
+MOD_UNLOAD(realname)
 {
 	return MOD_SUCCESS;
 }

src/modules/extbans/regnick.c

@@ -32,7 +32,7 @@ char *extban_regnick_conv_param(char *para);
 int extban_regnick_is_banned(aClient *sptr, aChannel *chptr, char *banin, int type);
 
 /** Called upon module init */
-DLLFUNC int MOD_INIT(regnick)(ModuleInfo *modinfo)
+MOD_INIT(regnick)
 {
 	ExtbanInfo req;
 	
@@ -53,13 +53,13 @@ DLLFUNC int MOD_INIT(regnick)(ModuleInfo *modinfo)
 }
 
 /** Called upon module load */
-DLLFUNC int MOD_LOAD(regnick)(int module_load)
+MOD_LOAD(regnick)
 {
 	return MOD_SUCCESS;
 }
 
 /** Called upon unload */
-DLLFUNC int MOD_UNLOAD(regnick)(int module_unload)
+MOD_UNLOAD(regnick)
 {
 	return MOD_SUCCESS;
 }

src/modules/jointhrottle.c

@@ -65,13 +65,13 @@ static void jointhrottle_increase_usercounter(aClient *cptr, aChannel *chptr);
 EVENT(jointhrottle_cleanup_structs);
 aJFlood *jointhrottle_addentry(aClient *cptr, aChannel *chptr);
 
-DLLFUNC int MOD_TEST(jointhrottle)(ModuleInfo *modinfo)
+MOD_TEST(jointhrottle)
 {
 	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, jointhrottle_config_test);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(jointhrottle)(ModuleInfo *modinfo)
+MOD_INIT(jointhrottle)
 {
 	ModDataInfo mreq;
 
@@ -98,13 +98,13 @@ DLLFUNC int MOD_INIT(jointhrottle)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(jointhrottle)(int module_load)
+MOD_LOAD(jointhrottle)
 {
 	EventAddEx(ModInfo->handle, "jointhrottle_cleanup_structs", 60, 0, jointhrottle_cleanup_structs, NULL);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(jointhrottle)(int module_unload)
+MOD_UNLOAD(jointhrottle)
 {
 	return MOD_FAILED;
 }

src/modules/m_addline.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_addline)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_addline)(ModuleInfo *modinfo)
+MOD_INIT(m_addline)
 {
 	CommandAdd(modinfo->handle, MSG_ADDLINE, m_addline, 1, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_addline)(int module_load)
+MOD_LOAD(m_addline)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_addline)(int module_unload)
+MOD_UNLOAD(m_addline)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_addmotd.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_addmotd)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_addmotd)(ModuleInfo *modinfo)
+MOD_INIT(m_addmotd)
 {
 	CommandAdd(modinfo->handle, MSG_ADDMOTD, m_addmotd, 1, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_addmotd)(int module_load)
+MOD_LOAD(m_addmotd)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_addmotd)(int module_unload)
+MOD_UNLOAD(m_addmotd)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_addomotd.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_addomotd)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_addomotd)(ModuleInfo *modinfo)
+MOD_INIT(m_addomotd)
 {
 	CommandAdd(modinfo->handle, MSG_ADDOMOTD, m_addomotd, 1, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_addomotd)(int module_load)
+MOD_LOAD(m_addomotd)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_addomotd)(int module_unload)
+MOD_UNLOAD(m_addomotd)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_admin.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_admin)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_admin)(ModuleInfo *modinfo)
+MOD_INIT(m_admin)
 {
 	CommandAdd(modinfo->handle, MSG_ADMIN, m_admin, MAXPARA, M_UNREGISTERED|M_USER|M_SHUN|M_VIRUS);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_admin)(int module_load)
+MOD_LOAD(m_admin)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_admin)(int module_unload)
+MOD_UNLOAD(m_admin)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_away.c

@@ -56,19 +56,19 @@ DLLFUNC ModuleHeader MOD_HEADER(m_away)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_away)(ModuleInfo *modinfo)
+MOD_INIT(m_away)
 {
 	CommandAdd(modinfo->handle, MSG_AWAY, m_away, 1, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_away)(int module_load)
+MOD_LOAD(m_away)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_away)(int module_unload)
+MOD_UNLOAD(m_away)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_botmotd.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_botmotd)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_botmotd)(ModuleInfo *modinfo)
+MOD_INIT(m_botmotd)
 {
 	CommandAdd(modinfo->handle, MSG_BOTMOTD, m_botmotd, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_botmotd)(int module_load)
+MOD_LOAD(m_botmotd)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_botmotd)(int module_unload)
+MOD_UNLOAD(m_botmotd)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_cap.c

@@ -452,7 +452,7 @@ DLLFUNC int m_cap(aClient *cptr, aClient *sptr, int parc, char *parv[])
 }
 
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(m_cap)(ModuleInfo *modinfo)
+MOD_INIT(m_cap)
 {
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	CommandAdd(modinfo->handle, MSG_CAP, m_cap, MAXPARA, M_UNREGISTERED|M_USER);
@@ -461,7 +461,7 @@ DLLFUNC int MOD_INIT(m_cap)(ModuleInfo *modinfo)
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(m_cap)(int module_load)
+MOD_LOAD(m_cap)
 {
 	clicap_build_list();
 	return MOD_SUCCESS;
@@ -469,7 +469,7 @@ DLLFUNC int MOD_LOAD(m_cap)(int module_load)
 
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(m_cap)(int module_unload)
+MOD_UNLOAD(m_cap)
 {
 	// XXX free cap list
 	return MOD_SUCCESS;

src/modules/m_chatops.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_chatops)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_chatops)(ModuleInfo *modinfo)
+MOD_INIT(m_chatops)
 {
 	CommandAdd(modinfo->handle, MSG_CHATOPS, m_chatops, 1, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_chatops)(int module_load)
+MOD_LOAD(m_chatops)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_chatops)(int module_unload)
+MOD_UNLOAD(m_chatops)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_chghost.c

@@ -60,20 +60,20 @@ ModuleHeader MOD_HEADER(m_chghost)
 	"3.2-b8-1",
     };
 
-DLLFUNC int MOD_INIT(m_chghost)(ModuleInfo *modinfo)
+MOD_INIT(m_chghost)
 {
 	CommandAdd(modinfo->handle, MSG_CHGHOST, m_chghost, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_chghost)(int module_load)
+MOD_LOAD(m_chghost)
 {
 	return MOD_SUCCESS;
 	
 }
 
-DLLFUNC int MOD_UNLOAD(m_chghost)(int module_unload)
+MOD_UNLOAD(m_chghost)
 {
 	return MOD_SUCCESS;	
 }

src/modules/m_chgident.c

@@ -62,7 +62,7 @@ ModuleHeader MOD_HEADER(m_chgident)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_chgident)(ModuleInfo *modinfo)
+MOD_INIT(m_chgident)
 {
 	/* extern variable to export m_chgident_info to temporary
            ModuleHeader *modulebuffer;
@@ -74,12 +74,12 @@ DLLFUNC int MOD_INIT(m_chgident)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_chgident)(int module_load)
+MOD_LOAD(m_chgident)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_chgident)(int module_unload)
+MOD_UNLOAD(m_chgident)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_chgname.c

@@ -62,7 +62,7 @@ ModuleHeader MOD_HEADER(m_chgname)
 
 
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(m_chgname)(ModuleInfo *modinfo)
+MOD_INIT(m_chgname)
 {
 	CommandAdd(modinfo->handle, MSG_CHGNAME, m_chgname, 2, 0);
 	CommandAdd(modinfo->handle, MSG_SVSNAME, m_chgname, 2, 0);
@@ -71,14 +71,14 @@ DLLFUNC int MOD_INIT(m_chgname)(ModuleInfo *modinfo)
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(m_chgname)(int module_load)
+MOD_LOAD(m_chgname)
 {
 	return MOD_SUCCESS;
 }
 
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(m_chgname)(int module_unload)
+MOD_UNLOAD(m_chgname)
 {
 	return MOD_SUCCESS;	
 }

src/modules/m_chmodetst.c

@@ -63,7 +63,7 @@ typedef struct {
 
 Cmode *ModeTest = NULL, *ModeTest2 = NULL;
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(m_dummy)(ModuleInfo *modinfo)
+MOD_INIT(m_dummy)
 {
 	CmodeInfo req;
 	ircd_log(LOG_ERROR, "debug: mod_init called from chmodetst module");
@@ -94,14 +94,14 @@ DLLFUNC int MOD_INIT(m_dummy)(ModuleInfo *modinfo)
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(m_dummy)(int module_load)
+MOD_LOAD(m_dummy)
 {
 	return MOD_SUCCESS;
 }
 
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(m_dummy)(int module_unload)
+MOD_UNLOAD(m_dummy)
 {
 	/* Aaaaaaaargh... we are assumed to be a permanent module */
 	sendto_realops("Mod_Unload was called??? Arghhhhhh..");

src/modules/m_close.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_close)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_close)(ModuleInfo *modinfo)
+MOD_INIT(m_close)
 {
 	CommandAdd(modinfo->handle, MSG_CLOSE, m_close, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_close)(int module_load)
+MOD_LOAD(m_close)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_close)(int module_unload)
+MOD_UNLOAD(m_close)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_connect.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_connect)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_connect)(ModuleInfo *modinfo)
+MOD_INIT(m_connect)
 {
 	CommandAdd(modinfo->handle, MSG_CONNECT, m_connect, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_connect)(int module_load)
+MOD_LOAD(m_connect)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_connect)(int module_unload)
+MOD_UNLOAD(m_connect)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_cycle.c

@@ -55,7 +55,7 @@ ModuleHeader MOD_HEADER(m_cycle)
     };
 
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(m_cycle)(ModuleInfo *modinfo)
+MOD_INIT(m_cycle)
 {
 	CommandAdd(modinfo->handle, MSG_CYCLE, m_cycle, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
@@ -63,14 +63,14 @@ DLLFUNC int MOD_INIT(m_cycle)(ModuleInfo *modinfo)
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(m_cycle)(int module_load)
+MOD_LOAD(m_cycle)
 {
 	return MOD_SUCCESS;
 	
 }
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(m_cycle)(int module_unload)
+MOD_UNLOAD(m_cycle)
 {
 	return MOD_SUCCESS;	
 }

src/modules/m_dccallow.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_dccallow)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_dccallow)(ModuleInfo *modinfo)
+MOD_INIT(m_dccallow)
 {
 	CommandAdd(modinfo->handle, MSG_DCCALLOW, m_dccallow, 1, M_USER|M_ANNOUNCE);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_dccallow)(int module_load)
+MOD_LOAD(m_dccallow)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_dccallow)(int module_unload)
+MOD_UNLOAD(m_dccallow)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_dccdeny.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_dccdeny)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_dccdeny)(ModuleInfo *modinfo)
+MOD_INIT(m_dccdeny)
 {
 	CommandAdd(modinfo->handle, MSG_DCCDENY, m_dccdeny, 2, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_dccdeny)(int module_load)
+MOD_LOAD(m_dccdeny)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_dccdeny)(int module_unload)
+MOD_UNLOAD(m_dccdeny)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_dummy.c

@@ -40,21 +40,21 @@ ModuleHeader MOD_HEADER(m_dummy)
     };
 
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(m_dummy)(ModuleInfo *modinfo)
+MOD_INIT(m_dummy)
 {
 	CommandAdd(modinfo->handle, MSG_DUMMY, m_dummy, MAXPARA, 0);
 	return MOD_SUCCESS;
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(m_dummy)(int module_load)
+MOD_LOAD(m_dummy)
 {
 	return MOD_SUCCESS;
 }
 
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(m_dummy)(int module_unload)
+MOD_UNLOAD(m_dummy)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_eos.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_eos)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_eos)(ModuleInfo *modinfo)
+MOD_INIT(m_eos)
 {
 	CommandAdd(modinfo->handle, MSG_EOS, m_eos, MAXPARA, M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_eos)(int module_load)
+MOD_LOAD(m_eos)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_eos)(int module_unload)
+MOD_UNLOAD(m_eos)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_globops.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_globops)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_globops)(ModuleInfo *modinfo)
+MOD_INIT(m_globops)
 {
 	CommandAdd(modinfo->handle, MSG_GLOBOPS, m_globops, 1, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_globops)(int module_load)
+MOD_LOAD(m_globops)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_globops)(int module_unload)
+MOD_UNLOAD(m_globops)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_guest.c

@@ -57,7 +57,7 @@ ModuleHeader MOD_HEADER(m_guest)
 
 ModuleInfo *ModGuestInfo;
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(m_guest)(ModuleInfo *modinfo)
+MOD_INIT(m_guest)
 {
 	/*
 	 * We call our add_Command crap here
@@ -71,7 +71,7 @@ DLLFUNC int MOD_INIT(m_guest)(ModuleInfo *modinfo)
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(m_guest)(int module_load)
+MOD_LOAD(m_guest)
 {
 	return MOD_SUCCESS;
 	
@@ -79,7 +79,7 @@ DLLFUNC int MOD_LOAD(m_guest)(int module_load)
 
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(m_guest)(int module_unload)
+MOD_UNLOAD(m_guest)
 {
 #ifdef GUEST
 	HookDel(GuestHook);

src/modules/m_help.c

@@ -55,7 +55,7 @@ ModuleHeader MOD_HEADER(m_help)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_help)(ModuleInfo *modinfo)
+MOD_INIT(m_help)
 {
 	CommandAdd(modinfo->handle, MSG_HELP, m_help, 1, 0);
 	CommandAdd(modinfo->handle, MSG_HELPOP, m_help, 1, 0);
@@ -63,12 +63,12 @@ DLLFUNC int MOD_INIT(m_help)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_help)(int module_load)
+MOD_LOAD(m_help)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_help)(int module_unload)
+MOD_UNLOAD(m_help)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_invite.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_invite)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_invite)(ModuleInfo *modinfo)
+MOD_INIT(m_invite)
 {
 	CommandAdd(modinfo->handle, MSG_INVITE, m_invite, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_invite)(int module_load)
+MOD_LOAD(m_invite)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_invite)(int module_unload)
+MOD_UNLOAD(m_invite)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_ison.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_ison)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_ison)(ModuleInfo *modinfo)
+MOD_INIT(m_ison)
 {
 	CommandAdd(modinfo->handle, MSG_ISON, m_ison, 1, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_ison)(int module_load)
+MOD_LOAD(m_ison)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_ison)(int module_unload)
+MOD_UNLOAD(m_ison)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_join.c

@@ -66,7 +66,7 @@ ModuleHeader MOD_HEADER(m_join)
 	NULL 
     };
 
-DLLFUNC int MOD_TEST(m_join)(ModuleInfo *modinfo)
+MOD_TEST(m_join)
 {
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	EfunctionAddVoid(modinfo->handle, EFUNC_JOIN_CHANNEL, _join_channel);
@@ -75,19 +75,19 @@ DLLFUNC int MOD_TEST(m_join)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(m_join)(ModuleInfo *modinfo)
+MOD_INIT(m_join)
 {
 	CommandAdd(modinfo->handle, MSG_JOIN, m_join, MAXPARA, M_USER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_join)(int module_load)
+MOD_LOAD(m_join)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_join)(int module_unload)
+MOD_UNLOAD(m_join)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_kick.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_kick)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_kick)(ModuleInfo *modinfo)
+MOD_INIT(m_kick)
 {
 	CommandAdd(modinfo->handle, MSG_KICK, m_kick, 3, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_kick)(int module_load)
+MOD_LOAD(m_kick)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_kick)(int module_unload)
+MOD_UNLOAD(m_kick)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_kill.c

@@ -56,7 +56,7 @@ ModuleHeader MOD_HEADER(m_kill)
     };
 
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(m_kill)(ModuleInfo *modinfo)
+MOD_INIT(m_kill)
 {
 	CommandAdd(modinfo->handle, MSG_KILL, m_kill, 2, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
@@ -64,14 +64,14 @@ DLLFUNC int MOD_INIT(m_kill)(ModuleInfo *modinfo)
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(m_kill)(int module_load)
+MOD_LOAD(m_kill)
 {
 	return MOD_SUCCESS;
 }
 
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(m_kill)(int module_unload)
+MOD_UNLOAD(m_kill)
 {
 	return MOD_SUCCESS;	
 }

src/modules/m_knock.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_knock)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_knock)(ModuleInfo *modinfo)
+MOD_INIT(m_knock)
 {
 	CommandAdd(modinfo->handle, MSG_KNOCK, m_knock, 2, M_USER|M_ANNOUNCE);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_knock)(int module_load)
+MOD_LOAD(m_knock)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_knock)(int module_unload)
+MOD_UNLOAD(m_knock)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_lag.c

@@ -55,7 +55,7 @@ ModuleHeader MOD_HEADER(m_lag)
     };
 
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(m_lag)(ModuleInfo *modinfo)
+MOD_INIT(m_lag)
 {
 	CommandAdd(modinfo->handle, MSG_LAG, m_lag, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
@@ -63,13 +63,13 @@ DLLFUNC int MOD_INIT(m_lag)(ModuleInfo *modinfo)
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(m_lag)(int module_load)
+MOD_LOAD(m_lag)
 {
 	return MOD_SUCCESS;
 }
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(m_lag)(int module_unload)
+MOD_UNLOAD(m_lag)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_links.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_links)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_links)(ModuleInfo *modinfo)
+MOD_INIT(m_links)
 {
 	CommandAdd(modinfo->handle, MSG_LINKS, m_links, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_links)(int module_load)
+MOD_LOAD(m_links)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_links)(int module_unload)
+MOD_UNLOAD(m_links)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_list.c

@@ -55,26 +55,26 @@ ModuleHeader MOD_HEADER(m_list)
 	NULL 
     };
 
-DLLFUNC int MOD_TEST(m_list)(ModuleInfo *modinfo)
+MOD_TEST(m_list)
 {
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	EfunctionAddVoid(modinfo->handle, EFUNC_SEND_LIST, _send_list);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(m_list)(ModuleInfo *modinfo)
+MOD_INIT(m_list)
 {
 	CommandAdd(modinfo->handle, MSG_LIST, m_list, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_list)(int module_load)
+MOD_LOAD(m_list)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_list)(int module_unload)
+MOD_UNLOAD(m_list)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_locops.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_locops)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_locops)(ModuleInfo *modinfo)
+MOD_INIT(m_locops)
 {
 	CommandAdd(modinfo->handle, MSG_LOCOPS, m_locops, 1, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_locops)(int module_load)
+MOD_LOAD(m_locops)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_locops)(int module_unload)
+MOD_UNLOAD(m_locops)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_lusers.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_lusers)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_lusers)(ModuleInfo *modinfo)
+MOD_INIT(m_lusers)
 {
 	CommandAdd(modinfo->handle, MSG_LUSERS, m_lusers, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_lusers)(int module_load)
+MOD_LOAD(m_lusers)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_lusers)(int module_unload)
+MOD_UNLOAD(m_lusers)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_map.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_map)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_map)(ModuleInfo *modinfo)
+MOD_INIT(m_map)
 {
 	CommandAdd(modinfo->handle, MSG_MAP, m_map, MAXPARA, M_USER|M_ANNOUNCE);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_map)(int module_load)
+MOD_LOAD(m_map)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_map)(int module_unload)
+MOD_UNLOAD(m_map)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_md.c

@@ -42,7 +42,7 @@ ModuleHeader MOD_HEADER(m_md)
 	NULL 
     };
 
-DLLFUNC int MOD_TEST(m_md)(ModuleInfo *modinfo)
+MOD_TEST(m_md)
 {
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	EfunctionAddVoid(modinfo->handle, EFUNC_SEND_MD_CLIENT, _send_md_client);
@@ -52,19 +52,19 @@ DLLFUNC int MOD_TEST(m_md)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(m_md)(ModuleInfo *modinfo)
+MOD_INIT(m_md)
 {
 	CommandAdd(modinfo->handle, "MD", m_md, MAXPARA, M_SERVER);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_md)(int module_load)
+MOD_LOAD(m_md)
 {
 	return MOD_SUCCESS;
 }
 
 
-DLLFUNC int MOD_UNLOAD(m_md)(int module_unload)
+MOD_UNLOAD(m_md)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_mdex.c

@@ -42,7 +42,7 @@ void mdex_free(ModData *m);
 char *mdex_serialize(ModData *m);
 void mdex_unserialize(char *str, ModData *m);
 
-DLLFUNC int MOD_INIT(m_mdex)(ModuleInfo *modinfo)
+MOD_INIT(m_mdex)
 {
 ModDataInfo mreq;
 
@@ -74,13 +74,13 @@ ModDataInfo mreq;
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_mdex)(int module_load)
+MOD_LOAD(m_mdex)
 {
 	return MOD_SUCCESS;
 }
 
 
-DLLFUNC int MOD_UNLOAD(m_mdex)(int module_unload)
+MOD_UNLOAD(m_mdex)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_message.c

@@ -63,7 +63,7 @@ ModuleHeader MOD_HEADER(m_message)
 	NULL 
     };
 
-DLLFUNC int MOD_TEST(m_message)(ModuleInfo *modinfo)
+MOD_TEST(m_message)
 {
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	EfunctionAddPChar(modinfo->handle, EFUNC_STRIPCOLORS, _StripColors);
@@ -73,7 +73,7 @@ DLLFUNC int MOD_TEST(m_message)(ModuleInfo *modinfo)
 }
 
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(m_message)(ModuleInfo *modinfo)
+MOD_INIT(m_message)
 {
 	CommandAdd(modinfo->handle, MSG_PRIVATE, m_private, 2, M_USER|M_SERVER|M_RESETIDLE|M_VIRUS);
 	CommandAdd(modinfo->handle, MSG_NOTICE, m_notice, 2, 0);
@@ -82,13 +82,13 @@ DLLFUNC int MOD_INIT(m_message)(ModuleInfo *modinfo)
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(m_message)(int module_load)
+MOD_LOAD(m_message)
 {
 	return MOD_SUCCESS;
 }
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(m_message)(int module_unload)
+MOD_UNLOAD(m_message)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_mkpasswd.c

@@ -56,19 +56,19 @@ ModuleHeader MOD_HEADER(m_mkpasswd)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_mkpasswd)(ModuleInfo *modinfo)
+MOD_INIT(m_mkpasswd)
 {
 	CommandAdd(modinfo->handle, MSG_MKPASSWD, m_mkpasswd, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_mkpasswd)(int module_load)
+MOD_LOAD(m_mkpasswd)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_mkpasswd)(int module_unload)
+MOD_UNLOAD(m_mkpasswd)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_mode.c

@@ -78,7 +78,7 @@ ModuleHeader MOD_HEADER(m_mode)
 	NULL 
     };
 
-DLLFUNC int MOD_TEST(m_mode)(ModuleInfo *modinfo)
+MOD_TEST(m_mode)
 {
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	EfunctionAddVoid(modinfo->handle, EFUNC_DO_MODE, _do_mode);
@@ -87,7 +87,7 @@ DLLFUNC int MOD_TEST(m_mode)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(m_mode)(ModuleInfo *modinfo)
+MOD_INIT(m_mode)
 {
 	CommandAdd(modinfo->handle, MSG_MODE, m_mode, MAXPARA, M_USER|M_SERVER);
 	CommandAdd(modinfo->handle, MSG_MLOCK, m_mlock, MAXPARA, M_SERVER);
@@ -95,12 +95,12 @@ DLLFUNC int MOD_INIT(m_mode)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_mode)(int module_load)
+MOD_LOAD(m_mode)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_mode)(int module_unload)
+MOD_UNLOAD(m_mode)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_motd.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_motd)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_motd)(ModuleInfo *modinfo)
+MOD_INIT(m_motd)
 {
 	CommandAdd(modinfo->handle, MSG_MOTD, m_motd, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_motd)(int module_load)
+MOD_LOAD(m_motd)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_motd)(int module_unload)
+MOD_UNLOAD(m_motd)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_names.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_names)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_names)(ModuleInfo *modinfo)
+MOD_INIT(m_names)
 {
 	CommandAdd(modinfo->handle, MSG_NAMES, m_names, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_names)(int module_load)
+MOD_LOAD(m_names)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_names)(int module_unload)
+MOD_UNLOAD(m_names)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_netinfo.c

@@ -52,19 +52,19 @@ ModuleHeader MOD_HEADER(m_netinfo)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_netinfo)(ModuleInfo *modinfo)
+MOD_INIT(m_netinfo)
 {
 	CommandAdd(modinfo->handle, MSG_NETINFO, m_netinfo, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_netinfo)(int module_load)
+MOD_LOAD(m_netinfo)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_netinfo)(int module_unload)
+MOD_UNLOAD(m_netinfo)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_nick.c

@@ -56,14 +56,14 @@ ModuleHeader MOD_HEADER(m_nick)
 	NULL 
     };
 
-DLLFUNC int MOD_TEST(m_nick)(ModuleInfo *modinfo)
+MOD_TEST(m_nick)
 {
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	EfunctionAdd(modinfo->handle, EFUNC_REGISTER_USER, _register_user);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(m_nick)(ModuleInfo *modinfo)
+MOD_INIT(m_nick)
 {
 	CommandAdd(modinfo->handle, MSG_NICK, m_nick, MAXPARA, M_USER|M_SERVER|M_UNREGISTERED);
 	CommandAdd(modinfo->handle, "UID", m_uid, MAXPARA, M_SERVER);
@@ -71,12 +71,12 @@ DLLFUNC int MOD_INIT(m_nick)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_nick)(int module_load)
+MOD_LOAD(m_nick)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_nick)(int module_unload)
+MOD_UNLOAD(m_nick)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_nopost.c

@@ -71,13 +71,13 @@ DLLFUNC int m_nopost_config_test(ConfigFile *, ConfigEntry *, int, int *);
 DLLFUNC int m_nopost_config_run(ConfigFile *, ConfigEntry *, int);
 static int is_except_host(aClient *sptr);
 
-DLLFUNC int MOD_TEST(m_nopost)(ModuleInfo *modinfo)
+MOD_TEST(m_nopost)
 {
 	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, m_nopost_config_test);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(m_nopost)(ModuleInfo *modinfo)
+MOD_INIT(m_nopost)
 {
 	CommandAdd(modinfo->handle, "GET", m_nopost, MAXPARA, M_UNREGISTERED);
 	CommandAdd(modinfo->handle, "POST", m_nopost, MAXPARA, M_UNREGISTERED);
@@ -88,12 +88,12 @@ DLLFUNC int MOD_INIT(m_nopost)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_nopost)(int module_load)
+MOD_LOAD(m_nopost)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_nopost)(int module_unload)
+MOD_UNLOAD(m_nopost)
 {
 	free_config();
 	return MOD_SUCCESS;

src/modules/m_oper.c

@@ -57,7 +57,7 @@ ModuleHeader MOD_HEADER(m_oper)
     };
 
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(m_oper)(ModuleInfo *modinfo)
+MOD_INIT(m_oper)
 {
 	CommandAdd(modinfo->handle, MSG_OPER, m_oper, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
@@ -65,13 +65,13 @@ DLLFUNC int MOD_INIT(m_oper)(ModuleInfo *modinfo)
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(m_oper)(int module_load)
+MOD_LOAD(m_oper)
 {
 	return MOD_SUCCESS;
 }
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(m_oper)(int module_unload)
+MOD_UNLOAD(m_oper)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_opermotd.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_opermotd)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_opermotd)(ModuleInfo *modinfo)
+MOD_INIT(m_opermotd)
 {
 	CommandAdd(modinfo->handle, MSG_OPERMOTD, m_opermotd, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_opermotd)(int module_load)
+MOD_LOAD(m_opermotd)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_opermotd)(int module_unload)
+MOD_UNLOAD(m_opermotd)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_part.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_part)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_part)(ModuleInfo *modinfo)
+MOD_INIT(m_part)
 {
 	CommandAdd(modinfo->handle, MSG_PART, m_part, 2, M_USER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_part)(int module_load)
+MOD_LOAD(m_part)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_part)(int module_unload)
+MOD_UNLOAD(m_part)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_pass.c

@@ -62,7 +62,7 @@ ModuleHeader MOD_HEADER(m_pass)
 /* Forward declarations */
 DLLFUNC int _check_banned(aClient *cptr);
 
-DLLFUNC int MOD_TEST(m_pass)(ModuleInfo *modinfo)
+MOD_TEST(m_pass)
 {
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 
@@ -71,7 +71,7 @@ DLLFUNC int MOD_TEST(m_pass)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(m_pass)(ModuleInfo *modinfo)
+MOD_INIT(m_pass)
 {
 	CommandAdd(modinfo->handle, MSG_PASS, m_pass, 1, M_UNREGISTERED|M_USER|M_SERVER);
 	
@@ -79,12 +79,12 @@ DLLFUNC int MOD_INIT(m_pass)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_pass)(int module_load)
+MOD_LOAD(m_pass)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_pass)(int module_unload)
+MOD_UNLOAD(m_pass)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_pingpong.c

@@ -58,7 +58,7 @@ ModuleHeader MOD_HEADER(m_pingpong)
 	NULL 
     };
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(m_pingpong)(ModuleInfo *modinfo)
+MOD_INIT(m_pingpong)
 {
 	/*
 	 * We call our add_Command crap here
@@ -71,14 +71,14 @@ DLLFUNC int MOD_INIT(m_pingpong)(ModuleInfo *modinfo)
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(m_pingpong)(int module_load)
+MOD_LOAD(m_pingpong)
 {
 	return MOD_SUCCESS;
 }
 
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(m_pingpong)(int module_unload)
+MOD_UNLOAD(m_pingpong)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_protoctl.c

@@ -52,19 +52,19 @@ ModuleHeader MOD_HEADER(m_protoctl)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_protoctl)(ModuleInfo *modinfo)
+MOD_INIT(m_protoctl)
 {
 	CommandAdd(modinfo->handle, MSG_PROTOCTL, m_protoctl, MAXPARA, M_UNREGISTERED|M_SERVER|M_USER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_protoctl)(int module_load)
+MOD_LOAD(m_protoctl)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_protoctl)(int module_unload)
+MOD_UNLOAD(m_protoctl)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_quit.c

@@ -55,7 +55,7 @@ ModuleHeader MOD_HEADER(m_quit)
     };
 
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(m_quit)(ModuleInfo *modinfo)
+MOD_INIT(m_quit)
 {
 	CommandAdd(modinfo->handle, MSG_QUIT, m_quit, 1, M_UNREGISTERED|M_USER|M_VIRUS);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
@@ -63,13 +63,13 @@ DLLFUNC int MOD_INIT(m_quit)(ModuleInfo *modinfo)
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(m_quit)(int module_load)
+MOD_LOAD(m_quit)
 {
 	return MOD_SUCCESS;
 }
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(m_quit)(int module_unload)
+MOD_UNLOAD(m_quit)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_rping.c

@@ -59,7 +59,7 @@ ModuleHeader MOD_HEADER(m_rping)
     };
 
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(m_rping)(ModuleInfo *modinfo)
+MOD_INIT(m_rping)
 {
 	CommandAdd(modinfo->handle, MSG_RPING, m_rping, MAXPARA, 0);
 	CommandAdd(modinfo->handle, MSG_RPONG, m_rpong, MAXPARA, 0);
@@ -68,14 +68,14 @@ DLLFUNC int MOD_INIT(m_rping)(ModuleInfo *modinfo)
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(m_rping)(int module_load)
+MOD_LOAD(m_rping)
 {
 	return MOD_SUCCESS;
 }
 
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(m_rping)(int module_unload)
+MOD_UNLOAD(m_rping)
 {
 	return MOD_SUCCESS;	
 }

src/modules/m_rules.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_rules)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_rules)(ModuleInfo *modinfo)
+MOD_INIT(m_rules)
 {
 	CommandAdd(modinfo->handle, MSG_RULES, m_rules, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_rules)(int module_load)
+MOD_LOAD(m_rules)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_rules)(int module_unload)
+MOD_UNLOAD(m_rules)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_sajoin.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_sajoin)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_sajoin)(ModuleInfo *modinfo)
+MOD_INIT(m_sajoin)
 {
 	CommandAdd(modinfo->handle, MSG_SAJOIN, m_sajoin, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_sajoin)(int module_load)
+MOD_LOAD(m_sajoin)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_sajoin)(int module_unload)
+MOD_UNLOAD(m_sajoin)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_samode.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_samode)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_samode)(ModuleInfo *modinfo)
+MOD_INIT(m_samode)
 {
 	CommandAdd(modinfo->handle, MSG_SAMODE, m_samode, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_samode)(int module_load)
+MOD_LOAD(m_samode)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_samode)(int module_unload)
+MOD_UNLOAD(m_samode)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_sapart.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_sapart)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_sapart)(ModuleInfo *modinfo)
+MOD_INIT(m_sapart)
 {
 	CommandAdd(modinfo->handle, MSG_SAPART, m_sapart, 3, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_sapart)(int module_load)
+MOD_LOAD(m_sapart)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_sapart)(int module_unload)
+MOD_UNLOAD(m_sapart)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_sasl.c

@@ -312,7 +312,7 @@ ClientCapability *cap;
 }
 
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(m_sasl)(ModuleInfo *modinfo)
+MOD_INIT(m_sasl)
 {
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 
@@ -329,13 +329,13 @@ DLLFUNC int MOD_INIT(m_sasl)(ModuleInfo *modinfo)
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(m_sasl)(int module_load)
+MOD_LOAD(m_sasl)
 {
 	return MOD_SUCCESS;
 }
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(m_sasl)(int module_unload)
+MOD_UNLOAD(m_sasl)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_sdesc.c

@@ -55,19 +55,19 @@ ModuleHeader MOD_HEADER(m_sdesc)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_sdesc)(ModuleInfo *modinfo)
+MOD_INIT(m_sdesc)
 {
 	CommandAdd(modinfo->handle, MSG_SDESC, m_sdesc, 1, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_sdesc)(int module_load)
+MOD_LOAD(m_sdesc)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_sdesc)(int module_unload)
+MOD_UNLOAD(m_sdesc)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_sendsno.c

@@ -55,7 +55,7 @@ ModuleHeader MOD_HEADER(m_sendsno)
     };
 
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(m_sendsno)(ModuleInfo *modinfo)
+MOD_INIT(m_sendsno)
 {
 	CommandAdd(modinfo->handle, MSG_SENDSNO, m_sendsno, MAXPARA, M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
@@ -63,13 +63,13 @@ DLLFUNC int MOD_INIT(m_sendsno)(ModuleInfo *modinfo)
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(m_sendsno)(int module_load)
+MOD_LOAD(m_sendsno)
 {
 	return MOD_SUCCESS;
 }
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(m_sendsno)(int module_unload)
+MOD_UNLOAD(m_sendsno)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_sendumode.c

@@ -56,7 +56,7 @@ ModuleHeader MOD_HEADER(m_sendumode)
     };
 
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(m_sendumode)(ModuleInfo *modinfo)
+MOD_INIT(m_sendumode)
 {
 	CommandAdd(modinfo->handle, MSG_SENDUMODE, m_sendumode, MAXPARA, 0);
 	CommandAdd(modinfo->handle, MSG_SMO, m_sendumode, MAXPARA, 0);
@@ -65,13 +65,13 @@ DLLFUNC int MOD_INIT(m_sendumode)(ModuleInfo *modinfo)
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(m_sendumode)(int module_load)
+MOD_LOAD(m_sendumode)
 {
 	return MOD_SUCCESS;
 }
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(m_sendumode)(int module_unload)
+MOD_UNLOAD(m_sendumode)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_server.c

@@ -62,7 +62,7 @@ ModuleHeader MOD_HEADER(m_server)
 	NULL 
     };
 
-DLLFUNC int MOD_TEST(m_server)(ModuleInfo *modinfo)
+MOD_TEST(m_server)
 {
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	EfunctionAddVoid(modinfo->handle, EFUNC_SEND_PROTOCTL_SERVERS, _send_protoctl_servers);
@@ -71,7 +71,7 @@ DLLFUNC int MOD_TEST(m_server)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_INIT(m_server)(ModuleInfo *modinfo)
+MOD_INIT(m_server)
 {
 	CommandAdd(modinfo->handle, MSG_SERVER, m_server, MAXPARA, M_UNREGISTERED|M_SERVER);
 	CommandAdd(modinfo->handle, "SID", m_server_remote, MAXPARA, M_UNREGISTERED|M_SERVER);
@@ -81,12 +81,12 @@ DLLFUNC int MOD_INIT(m_server)(ModuleInfo *modinfo)
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_server)(int module_load)
+MOD_LOAD(m_server)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_server)(int module_unload)
+MOD_UNLOAD(m_server)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_sethost.c

@@ -56,19 +56,19 @@ ModuleHeader MOD_HEADER(m_sethost)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_sethost)(ModuleInfo *modinfo)
+MOD_INIT(m_sethost)
 {
 	CommandAdd(modinfo->handle, MSG_SETHOST, m_sethost, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_sethost)(int module_load)
+MOD_LOAD(m_sethost)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_sethost)(int module_unload)
+MOD_UNLOAD(m_sethost)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_setident.c

@@ -55,19 +55,19 @@ ModuleHeader MOD_HEADER(m_setident)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_setident)(ModuleInfo *modinfo)
+MOD_INIT(m_setident)
 {
 	CommandAdd(modinfo->handle, MSG_SETIDENT, m_setident, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_setident)(int module_load)
+MOD_LOAD(m_setident)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_setident)(int module_unload)
+MOD_UNLOAD(m_setident)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_setname.c

@@ -55,19 +55,19 @@ ModuleHeader MOD_HEADER(m_setname)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_setname)(ModuleInfo *modinfo)
+MOD_INIT(m_setname)
 {
 	CommandAdd(modinfo->handle, MSG_SETNAME, m_setname, 1, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_setname)(int module_load)
+MOD_LOAD(m_setname)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_setname)(int module_unload)
+MOD_UNLOAD(m_setname)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_silence.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_silence)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_silence)(ModuleInfo *modinfo)
+MOD_INIT(m_silence)
 {
 	CommandAdd(modinfo->handle, MSG_SILENCE, m_silence, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_silence)(int module_load)
+MOD_LOAD(m_silence)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_silence)(int module_unload)
+MOD_UNLOAD(m_silence)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_sjoin.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_sjoin)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_sjoin)(ModuleInfo *modinfo)
+MOD_INIT(m_sjoin)
 {
 	CommandAdd(modinfo->handle, MSG_SJOIN, m_sjoin, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_sjoin)(int module_load)
+MOD_LOAD(m_sjoin)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_sjoin)(int module_unload)
+MOD_UNLOAD(m_sjoin)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_sqline.c

@@ -57,7 +57,7 @@ ModuleHeader MOD_HEADER(m_sqline)
     };
 
 /* This is called on module init, before Server Ready */
-DLLFUNC int MOD_INIT(m_sqline)(ModuleInfo *modinfo)
+MOD_INIT(m_sqline)
 {
 	CommandAdd(modinfo->handle, MSG_SQLINE, m_sqline, MAXPARA, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
@@ -65,14 +65,14 @@ DLLFUNC int MOD_INIT(m_sqline)(ModuleInfo *modinfo)
 }
 
 /* Is first run when server is 100% ready */
-DLLFUNC int MOD_LOAD(m_sqline)(int module_load)
+MOD_LOAD(m_sqline)
 {
 	return MOD_SUCCESS;
 }
 
 
 /* Called when module is unloaded */
-DLLFUNC int MOD_UNLOAD(m_sqline)(int module_unload)
+MOD_UNLOAD(m_sqline)
 {
 	return MOD_SUCCESS;
 }

src/modules/m_squit.c

@@ -54,19 +54,19 @@ ModuleHeader MOD_HEADER(m_squit)
 	NULL 
     };
 
-DLLFUNC int MOD_INIT(m_squit)(ModuleInfo *modinfo)
+MOD_INIT(m_squit)
 {
 	CommandAdd(modinfo->handle, MSG_SQUIT, m_squit, 2, 0);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_LOAD(m_squit)(int module_load)
+MOD_LOAD(m_squit)
 {
 	return MOD_SUCCESS;
 }
 
-DLLFUNC int MOD_UNLOAD(m_squit)(int module_unload)
+MOD_UNLOAD(m_squit)
 {
 	return MOD_SUCCESS;
 }