aMule: update to 2.3.1
[openwrt/svn-archive/archive.git] / net / mutella / patches / 003-gcc4_3_fixes.patch
1 diff --git a/mutella/common.h b/mutella/common.h
2 --- a/mutella/common.h
3 +++ b/mutella/common.h
4 @@ -50,7 +50,7 @@ CString restore_string(CString s, bool bFormMode = true);
5 bool QueryMatch(CString Result, const CString& Query);
6 // fast functions which do not copy the string
7 void MakeWordList(LPSTR szQuery, vector<char*>& QWords);
8 -void MakeWordList(LPSTR szQuery, vector<char*>& QWords, vector<char*>& QWords);
9 +void MakeWordList(LPSTR szQuery, vector<char*>& QWordsInc, vector<char*>&QWordsExc);
10 bool MatchWordList(const CString& ResultLower, const vector<char*>& QWords, bool bMatchAll = true);
11
12 // slower but 'storage-independent' versions
13 diff --git a/mutella/mutella.h b/mutella/mutella.h
14 --- a/mutella/mutella.h
15 +++ b/mutella/mutella.h
16 @@ -79,6 +79,7 @@ using std::insert_iterator;
17 #include <arpa/inet.h>
18 #include <netdb.h>
19 #include <errno.h>
20 +#include <cstring>
21
22 // library-type includes
23 #include "defines.h"
24 diff --git a/mutella/tstring.h b/mutella/tstring.h
25 --- a/mutella/tstring.h
26 +++ b/mutella/tstring.h
27 @@ -22,6 +22,7 @@
28 #define __TSTRING_H__INCLUDED__
29
30 #include <stdarg.h>
31 +#include <climits>
32 #include <iostream>
33
34 #ifdef TSTRING_DEBUG