diff --git a/src/plugins/LdapPlugin/ldapauth.c b/src/plugins/LdapPlugin/ldapauth.c index 5b8231c..2dde248 100644 --- a/src/plugins/LdapPlugin/ldapauth.c +++ b/src/plugins/LdapPlugin/ldapauth.c @@ -100,17 +100,7 @@ int savecouters(void) return (0); } -/*--------------------------------------------------------------------------*/ -#ifdef _WIN32 -__declspec(dllexport) int start(struct pluginlink * pluginlink, - int argc, char** argv); -#else - -int start(struct pluginlink * pluginlink, - int argc, char** argv); - -#endif /* --------------------------------------------------------------------------*/ static int ldapfunc(struct clientparam *param) @@ -467,7 +457,15 @@ int h_dircount(int argc, unsigned char ** argv) /*------------------------------- MAIN -------------------------------------- start plugin init */ -int start(struct pluginlink * pluginlink, int argc, char** argv) +#ifdef _WIN32 +__declspec(dllexport) int start(struct pluginlink * pluginlink, + int argc, char** argv) +#else + +int start(struct pluginlink * pluginlink, + int argc, char** argv) + +#endif { diff --git a/src/plugins/StringsPlugin/StringsPlugin.c b/src/plugins/StringsPlugin/StringsPlugin.c index c6c7eb6..911c4b9 100644 --- a/src/plugins/StringsPlugin/StringsPlugin.c +++ b/src/plugins/StringsPlugin/StringsPlugin.c @@ -151,8 +151,6 @@ static int restore_old_table(void * v) /*-------------------------------------------------------------------*/ #ifdef _WIN32 -__declspec(dllexport) int start(struct pluginlink * pluginlink, - int argc, char** argv); BOOL WINAPI DllMain( HINSTANCE hModule, DWORD ul_reason_for_call, LPVOID lpReserved @@ -165,17 +163,18 @@ BOOL WINAPI DllMain( HINSTANCE hModule, } return TRUE; } + +__declspec(dllexport) int start(struct pluginlink * pluginlink, + int argc, char** argv) + #else int start(struct pluginlink * pluginlink, - int argc, char** argv); - + int argc, char** argv) #endif -/*---------------------- start plugin init ------------------------------ */ -int start(struct pluginlink * pluginlink, int argc, char** argv) { FILE *f=NULL; diff --git a/src/plugins/WindowsAuthentication/WindowsAuthentication.c b/src/plugins/WindowsAuthentication/WindowsAuthentication.c index 9224bde..d0af431 100644 --- a/src/plugins/WindowsAuthentication/WindowsAuthentication.c +++ b/src/plugins/WindowsAuthentication/WindowsAuthentication.c @@ -15,10 +15,6 @@ extern "C" { #endif - __declspec(dllexport) int WindowsAuthentication(struct pluginlink * pluginlink, - int argc, char** argv); - - static struct auth alwaysauth; static char sidbuf[4096]; @@ -62,12 +58,7 @@ extern "C" { return 7; } -#ifdef __cplusplus -} -#endif - - -int WindowsAuthentication(struct pluginlink * pluginlink, int argc, char** argv){ +__declspec(dllexport) int WindowsAuthentication(struct pluginlink * pluginlink, int argc, char** argv){ char tmpbuf[4096]; DWORD dlen, sidlen; SID_NAME_USE snu; @@ -91,4 +82,7 @@ int WindowsAuthentication(struct pluginlink * pluginlink, int argc, char** argv) return 0; } +#ifdef __cplusplus +} +#endif diff --git a/src/plugins/utf8tocp1251/utf8tocp1251.c b/src/plugins/utf8tocp1251/utf8tocp1251.c index 866cebc..c0e21fc 100644 --- a/src/plugins/utf8tocp1251/utf8tocp1251.c +++ b/src/plugins/utf8tocp1251/utf8tocp1251.c @@ -14,9 +14,6 @@ extern "C" { #endif - __declspec(dllexport) int utf8tocp1251(struct pluginlink * pluginlink, - int argc, char** argv); - static struct auth alwaysauth; @@ -64,12 +61,9 @@ unsigned char * conv_utf8_to_cp1251(unsigned char *s){ return 4; } -#ifdef __cplusplus -} -#endif -int utf8tocp1251(struct pluginlink * pluginlink, int argc, char** argv){ + __declspec(dllexport) int utf8tocp1251(struct pluginlink * pluginlink, int argc, char** argv){ static int loaded = 0; @@ -85,4 +79,7 @@ int utf8tocp1251(struct pluginlink * pluginlink, int argc, char** argv){ } +#ifdef __cplusplus +} +#endif