From a61354ca53d0a61dfcce006ce2e8eb05fd47dc51 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 23 Jun 2012 12:16:06 +0000 Subject: CountryFlags: plusified git-svn-id: http://svn.miranda-ng.org/main/trunk@542 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CountryFlags/main.cpp | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'plugins/CountryFlags/main.cpp') diff --git a/plugins/CountryFlags/main.cpp b/plugins/CountryFlags/main.cpp index cb2f36b2e8..af6229b09c 100644 --- a/plugins/CountryFlags/main.cpp +++ b/plugins/CountryFlags/main.cpp @@ -43,13 +43,9 @@ static PLUGININFOEX pluginInfo={ }; static const MUUID interfaces[]={MIID_FLAGS,MIID_LAST}; -BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,void *pReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(pReserved); - if(fdwReason==DLL_PROCESS_ATTACH) - /* Do not call this function from a DLL that is linked to the static C run-time library (CRT). - * The static CRT requires DLL_THREAD_ATTACH and DLL_THREAD_DETATCH notifications to function properly. */ - DisableThreadLibraryCalls(hInst=hinstDLL); + hInst = hinstDLL; return TRUE; } @@ -82,21 +78,17 @@ static void InstallFile(const TCHAR *pszFileName,const TCHAR *pszDestSubDir) } } -#ifdef __cplusplus -extern "C" { -#endif - -__declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { return &pluginInfo; } -__declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) +extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) { return interfaces; } -__declspec(dllexport) int Load(PLUGINLINK *link) +extern "C" __declspec(dllexport) int Load(PLUGINLINK *link) { pluginLink=link; mir_getLP(&pluginInfo); @@ -128,7 +120,7 @@ __declspec(dllexport) int Load(PLUGINLINK *link) return 0; } -__declspec(dllexport) int Unload(void) +extern "C" __declspec(dllexport) int Unload(void) { KillBufferedFunctions(); UninitExtraImg(); @@ -136,8 +128,4 @@ __declspec(dllexport) int Unload(void) UninitIcons(); UninitCountryListExt(); return 0; -} - -#ifdef __cplusplus -} -#endif +} \ No newline at end of file -- cgit v1.2.3