Fix serverel gcc 4.3 related build failures.
git-svn-id: svn://svn.openwrt.org/openwrt/packages@14823 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
34
net/mutella/patches/003-gcc4_3_fixes.patch
Normal file
34
net/mutella/patches/003-gcc4_3_fixes.patch
Normal file
@ -0,0 +1,34 @@
|
||||
diff --git a/mutella/common.h b/mutella/common.h
|
||||
--- a/mutella/common.h
|
||||
+++ b/mutella/common.h
|
||||
@@ -50,7 +50,7 @@ CString restore_string(CString s, bool bFormMode = true);
|
||||
bool QueryMatch(CString Result, const CString& Query);
|
||||
// fast functions which do not copy the string
|
||||
void MakeWordList(LPSTR szQuery, vector<char*>& QWords);
|
||||
-void MakeWordList(LPSTR szQuery, vector<char*>& QWords, vector<char*>& QWords);
|
||||
+void MakeWordList(LPSTR szQuery, vector<char*>& QWordsInc, vector<char*>&QWordsExc);
|
||||
bool MatchWordList(const CString& ResultLower, const vector<char*>& QWords, bool bMatchAll = true);
|
||||
|
||||
// slower but 'storage-independent' versions
|
||||
diff --git a/mutella/mutella.h b/mutella/mutella.h
|
||||
--- a/mutella/mutella.h
|
||||
+++ b/mutella/mutella.h
|
||||
@@ -79,6 +79,7 @@ using std::insert_iterator;
|
||||
#include <arpa/inet.h>
|
||||
#include <netdb.h>
|
||||
#include <errno.h>
|
||||
+#include <cstring>
|
||||
|
||||
// library-type includes
|
||||
#include "defines.h"
|
||||
diff --git a/mutella/tstring.h b/mutella/tstring.h
|
||||
--- a/mutella/tstring.h
|
||||
+++ b/mutella/tstring.h
|
||||
@@ -22,6 +22,7 @@
|
||||
#define __TSTRING_H__INCLUDED__
|
||||
|
||||
#include <stdarg.h>
|
||||
+#include <climits>
|
||||
#include <iostream>
|
||||
|
||||
#ifdef TSTRING_DEBUG
|
Reference in New Issue
Block a user