diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2009-02-24 02:21:13 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2009-02-24 02:21:13 +0000 |
| commit | 50bc3ffa10be53d29807fbaba16b50eb816e213f (patch) | |
| tree | 3cd4fd78d2759ce1519d103eb49b6ef033a54a41 /net-p2p/mutella/files/mutella-0.4.5-gcc43.patch | |
| parent | Marked ~ppc for bug #229853. (diff) | |
| download | gentoo-2-50bc3ffa10be53d29807fbaba16b50eb816e213f.tar.gz gentoo-2-50bc3ffa10be53d29807fbaba16b50eb816e213f.tar.bz2 gentoo-2-50bc3ffa10be53d29807fbaba16b50eb816e213f.zip | |
Fix building w/ gcc-4.3 (bug #251555). Patch from Gene Seto
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'net-p2p/mutella/files/mutella-0.4.5-gcc43.patch')
| -rw-r--r-- | net-p2p/mutella/files/mutella-0.4.5-gcc43.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/net-p2p/mutella/files/mutella-0.4.5-gcc43.patch b/net-p2p/mutella/files/mutella-0.4.5-gcc43.patch new file mode 100644 index 000000000000..47ee8a155c59 --- /dev/null +++ b/net-p2p/mutella/files/mutella-0.4.5-gcc43.patch @@ -0,0 +1,48 @@ +diff -rupN mutella-0.4.5b/mutella/common.h mutella-0.4.5/mutella/common.h +--- mutella-0.4.5b/mutella/common.h 2009-01-26 02:01:11.000000000 -0400 ++++ mutella-0.4.5/mutella/common.h 2009-01-26 02:05:37.000000000 -0400 +@@ -50,7 +50,7 @@ CString restore_string(CString s, bool b + 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*>& QWords); + bool MatchWordList(const CString& ResultLower, const vector<char*>& QWords, bool bMatchAll = true); + + // slower but 'storage-independent' versions +diff -rupN mutella-0.4.5b/mutella/tstring.h mutella-0.4.5/mutella/tstring.h +--- mutella-0.4.5b/mutella/tstring.h 2009-01-26 02:01:11.000000000 -0400 ++++ mutella-0.4.5/mutella/tstring.h 2009-01-26 02:04:00.000000000 -0400 +@@ -23,6 +23,7 @@ + + #include <stdarg.h> + #include <iostream> ++#include <climits> + + #ifdef TSTRING_DEBUG + +diff -rupN mutella-0.4.5b/mutella/conversions.h mutella-0.4.5/mutella/conversions.h +--- mutella-0.4.5b/mutella/conversions.h 2009-01-26 02:17:42.000000000 -0400 ++++ mutella-0.4.5/mutella/conversions.h 2009-01-26 02:18:25.000000000 -0400 +@@ -19,9 +19,9 @@ + copyright : (C) 2001 by
+ email : maksik@gmx.co.uk
+ ***************************************************************************/
+-
+ #if !defined(__CONVERSIONS_H_INCLUDED__)
+ #define __CONVERSIONS_H_INCLUDED__
++#include <cstring>
+
+ CString DWrdtoStr(DWORD); // Convert DWORD to a CString
+
+diff -rupN mutella-0.4.5b/mutella/gnumarkedfiles.cpp mutella-0.4.5/mutella/gnumarkedfiles.cpp +--- mutella-0.4.5b/mutella/gnumarkedfiles.cpp 2009-01-26 02:17:42.000000000 -0400 ++++ mutella-0.4.5/mutella/gnumarkedfiles.cpp 2009-01-26 02:18:46.000000000 -0400 +@@ -10,6 +10,7 @@ + #include "config.h" + #endif + ++#include <cstring> + #include "mutella.h" + #include "structures.h" + |