summaryrefslogtreecommitdiff
path: root/protocols/MSN/msn_global.h
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-06-26 16:50:14 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-06-26 16:50:14 +0000
commitc992cb2fdc11f1cac4bc5cbce26e8e2bb3b57da0 (patch)
tree697bdbf38a8a1f6b828a8bfbd08a478e19a82c6b /protocols/MSN/msn_global.h
parentf616294363c642d138f9dc0ef6eceae639e2434c (diff)
- microkernel addded;
- version bumped to 0.92.2 git-svn-id: http://svn.miranda-ng.org/main/trunk@641 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MSN/msn_global.h')
-rw-r--r--protocols/MSN/msn_global.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/protocols/MSN/msn_global.h b/protocols/MSN/msn_global.h
index 306244f896..2b2ef91a70 100644
--- a/protocols/MSN/msn_global.h
+++ b/protocols/MSN/msn_global.h
@@ -212,12 +212,6 @@ void overrideStr(TCHAR*& dest, const TCHAR* src, bool unicode, const TCHAR* de
void replaceStr(char*& dest, const char* src);
void replaceStr(wchar_t*& dest, const wchar_t* src);
-char* __fastcall ltrimp(char* str);
-char* __fastcall rtrim(char* string);
-wchar_t* __fastcall rtrim(wchar_t* string);
-
-__inline char* lrtrimp(char* str) { return ltrimp(rtrim(str)); };
-
char* arrayToHex(BYTE* data, size_t datasz);
inline unsigned short _htons(unsigned short s)
@@ -260,7 +254,7 @@ struct STRLIST : public LIST<char>
for (int i=0; i < count; i++)
mir_free(items[i]);
- li.List_Destroy((SortedList*)this);
+ List_Destroy((SortedList*)this);
}
int insertn(const char* p) { return insert(mir_strdup(p)); }
@@ -268,13 +262,13 @@ struct STRLIST : public LIST<char>
int remove(int idx)
{
mir_free(items[idx]);
- return li.List_Remove((SortedList*)this, idx);
+ return List_Remove((SortedList*)this, idx);
}
int remove(const char* p)
{
int idx;
- return li.List_GetIndex((SortedList*)this, (char*)p, &idx) == 1 ? remove(idx) : -1;
+ return List_GetIndex((SortedList*)this, (char*)p, &idx) == 1 ? remove(idx) : -1;
}
};