diff options
| -rw-r--r-- | plugins/Quotes/Forex.vcxproj | 4 | ||||
| -rw-r--r-- | src/modules/plugins/newplugins.cpp | 17 |
2 files changed, 8 insertions, 13 deletions
diff --git a/plugins/Quotes/Forex.vcxproj b/plugins/Quotes/Forex.vcxproj index 1e6522063c..22e0803fe1 100644 --- a/plugins/Quotes/Forex.vcxproj +++ b/plugins/Quotes/Forex.vcxproj @@ -89,6 +89,7 @@ <SubSystem>Windows</SubSystem>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <AdditionalLibraryDirectories>..\..\..\boost_1_49_0\lib</AdditionalLibraryDirectories>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
@@ -111,6 +112,7 @@ <SubSystem>Windows</SubSystem>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <AdditionalLibraryDirectories>..\..\..\boost_1_49_0\lib64</AdditionalLibraryDirectories>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
@@ -136,6 +138,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <AdditionalLibraryDirectories>..\..\..\boost_1_49_0\lib</AdditionalLibraryDirectories>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
@@ -161,6 +164,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <AdditionalLibraryDirectories>..\..\..\boost_1_49_0\lib64</AdditionalLibraryDirectories>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp index 1b73fb9a2d..ff1c51f168 100644 --- a/src/modules/plugins/newplugins.cpp +++ b/src/modules/plugins/newplugins.cpp @@ -143,8 +143,7 @@ char * GetPluginNameByInstance( HINSTANCE hInstance ) {
int i = 0;
if ( pluginList.getCount() == 0) return NULL;
- for (i = 0; i < pluginList.getCount(); i++)
- {
+ for (i = 0; i < pluginList.getCount(); i++) {
pluginEntry* pe = pluginList[i];
if (pe->bpi.pluginInfo && pe->bpi.hInst == hInstance)
return pe->bpi.pluginInfo->shortName;
@@ -183,9 +182,9 @@ static int uuidToString(const MUUID uuid, char *szStr, int cbLen) return 1;
}
-static int equalUUID(MUUID u1, MUUID u2)
+static int equalUUID(const MUUID& u1, const MUUID& u2)
{
- return memcmp(&u1, &u2, sizeof(MUUID))?0:1;
+ return memcmp(&u1, &u2, sizeof(MUUID))?0:1;
}
static MUUID miid_last = MIID_LAST;
@@ -194,20 +193,12 @@ static MUUID miid_servicemode = MIID_SERVICEMODE; static int validInterfaceList(Miranda_Plugin_Interfaces ifaceProc)
{
MUUID *piface = ( ifaceProc ) ? ifaceProc() : NULL;
- int i = 0/*, j*/;
+ int i = 0/*, j*/;
if (!piface)
return 0;
if (equalUUID(miid_last, piface[0]))
return 0;
- /*while (!equalUUID(miid_last, piface[i]) ) {
- for (j=0; j<interfaceBannedListCount; j++) {
- if (equalUUID(interfaceBannedList[j].uuid, piface[i]))
- return 0;
- i++;
- }
- break;
- }*/
return 1;
}
|