diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2012-06-23 12:16:06 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2012-06-23 12:16:06 +0000 |
| commit | a61354ca53d0a61dfcce006ce2e8eb05fd47dc51 (patch) | |
| tree | 1fe60d7c597c501232ed773aa2853d1c53592cc1 /plugins/CountryFlags/main.cpp | |
| parent | 2cb25593d58160d3b3befabfa59f3c389724a419 (diff) | |
CountryFlags:
plusified
git-svn-id: http://svn.miranda-ng.org/main/trunk@542 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/CountryFlags/main.cpp')
| -rw-r--r-- | plugins/CountryFlags/main.cpp | 26 |
1 files changed, 7 insertions, 19 deletions
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 |