diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-06-26 23:41:55 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-06-26 23:41:55 +0000 |
| commit | 25221b7d2afb70f82eb3805330fd39a6f6708049 (patch) | |
| tree | 6fdd3eb5c5642788e1f8286385b15535f9a7ec16 /plugins/UserInfoEx/commonheaders.cpp | |
| parent | ef81e9edc10e2478f514e1fbfb0828ad1e7d8e49 (diff) | |
mk: removed all LIST_INTERFACE, MI_INTERFACE & UTF8_INTERFACE instances.
all related functions moved to mir_core.
git-svn-id: http://svn.miranda-ng.org/main/trunk@644 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/UserInfoEx/commonheaders.cpp')
| -rw-r--r-- | plugins/UserInfoEx/commonheaders.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/plugins/UserInfoEx/commonheaders.cpp b/plugins/UserInfoEx/commonheaders.cpp index f74cb2261e..608d7ddbfc 100644 --- a/plugins/UserInfoEx/commonheaders.cpp +++ b/plugins/UserInfoEx/commonheaders.cpp @@ -31,10 +31,6 @@ Last change by : $Author: ing.u.horn $ // global:
HINSTANCE ghInst = NULL;
-MM_INTERFACE mmi; //memory interface
-UTF8_INTERFACE utfi; //utf8 interface
-LIST_INTERFACE li; //list interface
-//XML_API xi; //for late use
TIME_API tmi; //timezone interface
FI_INTERFACE *FIP = NULL; //freeimage interface
CLIST_INTERFACE *pcli = NULL;
@@ -57,7 +53,7 @@ pfnDwmIsCompositionEnabled dwmIsCompositionEnabled; DWORD hashSetting(LPCSTR szStr)
{
#if defined _M_IX86 && !defined _NUMEGA_BC_FINALCHECK && !defined NOINLINEASM
- __asm
+ __asm
{
xor edx,edx
xor eax,eax
@@ -82,7 +78,7 @@ DWORD hashSetting(LPCSTR szStr) DWORD hash = 0;
int i;
int shift = 0;
- for (i = 0; szStr[i]; i++)
+ for (i = 0; szStr[i]; i++)
{
hash ^= szStr[i] << shift;
if (shift > 24)
@@ -95,7 +91,7 @@ DWORD hashSetting(LPCSTR szStr) #endif
}
-// MurmurHash2
+// MurmurHash2
#ifdef _DEBUG
#pragma optimize( "gt", on )
#endif
@@ -116,17 +112,17 @@ unsigned int __fastcall hash_M2(const void * key, unsigned int len) {
unsigned int k = *(unsigned int *)data;
- k *= m;
- k ^= k >> r;
- k *= m;
-
- h *= m;
+ k *= m;
+ k ^= k >> r;
+ k *= m;
+
+ h *= m;
h ^= k;
data += 4;
len -= 4;
}
-
+
// Handle the last few bytes of the input array
switch(len)
{
|