From 769b537b5e1a99fc53aa7296fd2b21dc77a4071c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 16 Aug 2015 20:33:13 +0000 Subject: name conflicts solved git-svn-id: http://svn.miranda-ng.org/main/trunk@14971 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/NewEventNotify/src/main.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'plugins/NewEventNotify/src/main.cpp') diff --git a/plugins/NewEventNotify/src/main.cpp b/plugins/NewEventNotify/src/main.cpp index 1a67cb7d77..b81570c9f6 100644 --- a/plugins/NewEventNotify/src/main.cpp +++ b/plugins/NewEventNotify/src/main.cpp @@ -31,7 +31,7 @@ extern PLUGIN_DATA* PopupList[20]; //---Some global variables for the plugin CLIST_INTERFACE *pcli; -HINSTANCE hInst; +HINSTANCE g_hInst; PLUGIN_OPTIONS pluginOptions; int hLangpack; PLUGININFOEX pluginInfo = { @@ -123,7 +123,7 @@ int HookedInit(WPARAM, LPARAM) //---Called when an options dialog has to be created int HookedOptions(WPARAM wParam, LPARAM) { - OptionsAdd(hInst, wParam); + OptionsAdd(g_hInst, wParam); return 0; } @@ -144,8 +144,7 @@ extern "C" __declspec(dllexport) int Load(void) mir_getCLI(); OptionsInit(&pluginOptions); - pluginOptions.hInst = hInst; - + pluginOptions.hInst = g_hInst; return 0; } @@ -156,7 +155,7 @@ extern "C" __declspec(dllexport) int Unload(void) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { - hInst = hinstDLL; + g_hInst = hinstDLL; return TRUE; } -- cgit v1.2.3