|
1396
|
1 |
--- aMule-2.2.2/autogen.sh.orig Fri Sep 26 18:20:47 2008
|
|
|
2 |
+++ aMule-2.2.2/autogen.sh Fri Sep 26 18:16:52 2008
|
|
|
3 |
@@ -1,4 +1,4 @@
|
|
|
4 |
-#!/bin/sh
|
|
|
5 |
+#!/bin/bash
|
|
|
6 |
# Helps bootstrapping 'aMule' when checked out from CVS.
|
|
|
7 |
# Requires GNU autoconf, GNU automake and GNU which.
|
|
|
8 |
|
|
|
9 |
--- aMule-2.2.2/src/ArchSpecific.h.orig Fri Sep 26 18:21:22 2008
|
|
|
10 |
+++ aMule-2.2.2/src/ArchSpecific.h Fri Sep 26 18:21:40 2008
|
|
|
11 |
@@ -33,7 +33,7 @@
|
|
|
12 |
#define ENDIAN_SWAP_32(x) (wxUINT32_SWAP_ON_BE(x))
|
|
|
13 |
#define ENDIAN_SWAP_I_32(x) x = wxUINT32_SWAP_ON_BE(x)
|
|
|
14 |
|
|
|
15 |
-#if ((defined __GNUC__) && __GNUC__ >= 2) || defined (_MSC_VER)
|
|
|
16 |
+#if ((defined __GNUC__) && __GNUC__ >= 2) || defined (_MSC_VER) || (defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x550))
|
|
|
17 |
#define ENDIAN_SWAP_64(x) (wxUINT64_SWAP_ON_BE(x))
|
|
|
18 |
#define ENDIAN_SWAP_I_64(x) x = wxUINT64_SWAP_ON_BE(x)
|
|
|
19 |
#endif
|
|
|
20 |
--- aMule-2.2.2/src/StatTree.h.orig Fri Sep 26 18:29:18 2008
|
|
|
21 |
+++ aMule-2.2.2/src/StatTree.h Fri Sep 26 18:51:14 2008
|
|
|
22 |
@@ -240,7 +240,7 @@
|
|
|
23 |
/**
|
|
|
24 |
* Resorts children for the stSortByValue flag.
|
|
|
25 |
*/
|
|
|
26 |
- void ReSortChildren() { wxMutexLocker lock(m_lock); m_children.sort(ValueSort); }
|
|
|
27 |
+ void ReSortChildren() { wxMutexLocker lock(m_lock); m_children.sort(); }
|
|
|
28 |
#endif
|
|
|
29 |
|
|
|
30 |
#ifndef AMULE_DAEMON
|
|
|
31 |
--- aMule-2.2.2/src/amule.cpp.orig Fri Sep 26 19:06:01 2008
|
|
|
32 |
+++ aMule-2.2.2/src/amule.cpp Fri Sep 26 19:09:08 2008
|
|
|
33 |
@@ -386,7 +386,7 @@
|
|
|
34 |
}
|
|
|
35 |
|
|
|
36 |
theApp->ShowAlert(msg, wxT("Fatal error."), wxICON_ERROR | wxOK);
|
|
|
37 |
- return std::pair<bool, wxString>(false, wxEmptyString);
|
|
|
38 |
+ return std::pair<bool, CPath>(false, CPath(wxEmptyString));
|
|
|
39 |
}
|
|
|
40 |
|
|
|
41 |
|
|
|
42 |
@@ -845,10 +845,7 @@
|
|
|
43 |
} else {
|
|
|
44 |
delete p;
|
|
|
45 |
ShowAlert(_(
|
|
|
46 |
- "You requested to run web server on startup, "
|
|
|
47 |
- "but the amuleweb binary cannot be run. "
|
|
|
48 |
- "Please install the package containing aMule web server, "
|
|
|
49 |
- "or compile aMule using --enable-webserver and run make install"),
|
|
|
50 |
+ "You requested to run web server on startup, but the amuleweb binary cannot be run. Please install the package containing aMule web server, or compile aMule using --enable-webserver and run make install"),
|
|
|
51 |
_("ERROR"), wxOK | wxICON_ERROR);
|
|
|
52 |
}
|
|
|
53 |
}
|
|
|
54 |
--- aMule-2.2.2/src/ClientList.h.orig Fri Sep 26 19:12:25 2008
|
|
|
55 |
+++ aMule-2.2.2/src/ClientList.h Fri Sep 26 19:13:52 2008
|
|
|
56 |
@@ -282,7 +282,7 @@
|
|
|
57 |
//! The type of the lists used to store IPs and IDs.
|
|
|
58 |
typedef std::multimap<uint32, CUpDownClient*> IDMap;
|
|
|
59 |
//! The pairs of the IP/ID list.
|
|
|
60 |
- typedef std::pair<uint32, CUpDownClient*> IDMapPair;
|
|
|
61 |
+ typedef std::pair<const uint32, CUpDownClient*> IDMapPair;
|
|
|
62 |
|
|
|
63 |
|
|
|
64 |
/**
|
|
|
65 |
@@ -393,7 +393,7 @@
|
|
|
66 |
//! The type of the list used to store user-hashes.
|
|
|
67 |
typedef std::multimap<CMD4Hash, CUpDownClient*> HashMap;
|
|
|
68 |
//! The pairs of the Hash-list.
|
|
|
69 |
- typedef std::pair<CMD4Hash, CUpDownClient*> HashMapPair;
|
|
|
70 |
+ typedef std::pair<const CMD4Hash, CUpDownClient*> HashMapPair;
|
|
|
71 |
|
|
|
72 |
|
|
|
73 |
//! The map of clients with valid hashes
|
|
|
74 |
--- aMule-2.2.2/src/ClientList.cpp.orig Fri Sep 26 19:11:17 2008
|
|
|
75 |
+++ aMule-2.2.2/src/ClientList.cpp Fri Sep 26 19:14:53 2008
|
|
|
76 |
@@ -271,7 +271,7 @@
|
|
|
77 |
|
|
|
78 |
CUpDownClient* CClientList::FindMatchingClient( CUpDownClient* client )
|
|
|
79 |
{
|
|
|
80 |
- typedef std::pair<IDMap::const_iterator, IDMap::const_iterator> IDMapIteratorPair;
|
|
|
81 |
+ typedef std::pair<IDMap::iterator, IDMap::iterator> IDMapIteratorPair;
|
|
|
82 |
wxCHECK(client, NULL);
|
|
|
83 |
|
|
|
84 |
const uint32 userIP = client->GetIP();
|
|
|
85 |
@@ -317,7 +317,7 @@
|
|
|
86 |
}
|
|
|
87 |
} else if (userPort || userKadPort) {
|
|
|
88 |
// Check by IP first, then by ID
|
|
|
89 |
- struct { const IDMap& map; uint32 value; } toCheck[] = {
|
|
|
90 |
+ struct { IDMap map; uint32 value; } toCheck[] = {
|
|
|
91 |
{ m_ipList, userIP }, { m_clientList, userID }
|
|
|
92 |
};
|
|
|
93 |
|
|
|
94 |
--- aMule-2.2.2/src/RangeMap.h.orig Fri Sep 26 23:20:22 2008
|
|
|
95 |
+++ aMule-2.2.2/src/RangeMap.h Fri Sep 26 23:31:04 2008
|
|
|
96 |
@@ -119,7 +119,7 @@
|
|
|
97 |
//! The map uses the start-key as key and the User-value and end-key pair as value
|
|
|
98 |
typedef std::map<KEYTYPE, HELPER> RangeMap;
|
|
|
99 |
//! Shortcut for the pair used by the RangeMap.
|
|
|
100 |
- typedef std::pair<KEYTYPE, HELPER> RangePair;
|
|
|
101 |
+ typedef std::pair<const KEYTYPE, HELPER> RangePair;
|
|
|
102 |
|
|
|
103 |
//! Typedefs used to distinguish between our custom iterator and the real ones.
|
|
|
104 |
typedef typename RangeMap::iterator RangeIterator;
|
|
|
105 |
@@ -420,7 +420,10 @@
|
|
|
106 |
}
|
|
|
107 |
template <typename TYPE>
|
|
|
108 |
iterator insert(KEYTYPE startPos, KEYTYPE endPos, const TYPE& value) {
|
|
|
109 |
- HELPER entry = {endPos, value};
|
|
|
110 |
+// HELPER entry = {endPos, value};
|
|
|
111 |
+ HELPER entry = {};
|
|
|
112 |
+ entry.first = endPos;
|
|
|
113 |
+ entry.second = value;
|
|
|
114 |
return do_insert(startPos, entry);
|
|
|
115 |
}
|
|
|
116 |
//@}
|
|
|
117 |
--- aMule-2.2.2/src/ServerList.cpp.orig Fri Sep 26 23:34:57 2008
|
|
|
118 |
+++ aMule-2.2.2/src/ServerList.cpp Fri Sep 26 23:51:32 2008
|
|
|
119 |
@@ -531,7 +531,7 @@
|
|
|
120 |
|
|
|
121 |
void CServerList::Sort()
|
|
|
122 |
{
|
|
|
123 |
- m_servers.sort(ServerPriorityComparator());
|
|
|
124 |
+ m_servers.sort();
|
|
|
125 |
// Once the list has been sorted, it doesn't really make sense to continue
|
|
|
126 |
// traversing the new order from the old position. Plus, there's a bug in
|
|
|
127 |
// version of libstdc++ before gcc4 such that iterators that were equal to
|
|
|
128 |
@@ -877,7 +877,7 @@
|
|
|
129 |
|
|
|
130 |
EventType::ValueList ilist;
|
|
|
131 |
ilist.reserve( m_servers.size() );
|
|
|
132 |
- ilist.assign( m_servers.begin(), m_servers.end() );
|
|
|
133 |
+ ilist.assign( m_servers.size(), *m_servers.begin() );
|
|
|
134 |
|
|
|
135 |
NotifyObservers( EventType( EventType::INITIAL, &ilist ), o );
|
|
|
136 |
}
|
|
|
137 |
@@ -916,7 +916,7 @@
|
|
|
138 |
{
|
|
|
139 |
std::vector<const CServer*> result;
|
|
|
140 |
result.reserve(m_servers.size());
|
|
|
141 |
- result.assign(m_servers.begin(), m_servers.end());
|
|
|
142 |
+ result.assign(m_servers.size(), *m_servers.begin());
|
|
|
143 |
return result;
|
|
|
144 |
}
|
|
|
145 |
|
|
|
146 |
--- aMule-2.2.2/src/kademlia/net/KademliaUDPListener.cpp.orig Fri Sep 26 23:53:28 2008
|
|
|
147 |
+++ aMule-2.2.2/src/kademlia/net/KademliaUDPListener.cpp Fri Sep 26 23:55:22 2008
|
|
|
148 |
@@ -70,6 +70,9 @@
|
|
|
149 |
|
|
|
150 |
#define THIS_DEBUG_IS_JUST_FOR_KRY_DONT_TOUCH_IT_KTHX 0
|
|
|
151 |
|
|
|
152 |
+#if defined(__SUNPRO_CC)
|
|
|
153 |
+#define __FUNCTION__ __FILE__+__LINE__
|
|
|
154 |
+#endif
|
|
|
155 |
|
|
|
156 |
#define CHECK_PACKET_SIZE(OP, SIZE) \
|
|
|
157 |
if (lenPacket OP (uint32_t)(SIZE)) \
|
|
|
158 |
--- aMule-2.2.2/src/UPnPBase.h.orig Fri Sep 26 18:55:28 2008
|
|
|
159 |
+++ aMule-2.2.2/src/UPnPBase.h Fri Sep 26 23:56:53 2008
|
|
|
160 |
@@ -157,7 +157,7 @@
|
|
|
161 |
* UPnPLib explicitly, making this dlopen() stuff unnecessary.
|
|
|
162 |
*/
|
|
|
163 |
template <typename T, char const *XML_ELEMENT_NAME, char const *XML_LIST_NAME>
|
|
|
164 |
-class CXML_List : public std::map<const std::string, T *>
|
|
|
165 |
+class CXML_List : public std::map<std::string, T *>
|
|
|
166 |
{
|
|
|
167 |
public:
|
|
|
168 |
CXML_List(
|
|
|
169 |
@@ -204,31 +204,43 @@
|
|
|
170 |
}
|
|
|
171 |
|
|
|
172 |
#ifdef UPNP_C
|
|
|
173 |
- char s_argument[] = "argument";
|
|
|
174 |
- char s_argumentList[] = "argumentList";
|
|
|
175 |
- char s_action[] = "action";
|
|
|
176 |
- char s_actionList[] = "actionList";
|
|
|
177 |
- char s_allowedValue[] = "allowedValue";
|
|
|
178 |
- char s_allowedValueList[] = "allowedValueList";
|
|
|
179 |
- char s_stateVariable[] = "stateVariable";
|
|
|
180 |
- char s_serviceStateTable[] = "serviceStateTable";
|
|
|
181 |
- char s_service[] = "service";
|
|
|
182 |
- char s_serviceList[] = "serviceList";
|
|
|
183 |
- char s_device[] = "device";
|
|
|
184 |
- char s_deviceList[] = "deviceList";
|
|
|
185 |
+ extern const char s_argument[];
|
|
|
186 |
+ extern const char s_argumentList[];
|
|
|
187 |
+ extern const char s_action[];
|
|
|
188 |
+ extern const char s_actionList[];
|
|
|
189 |
+ extern const char s_allowedValue[];
|
|
|
190 |
+ extern const char s_allowedValueList[];
|
|
|
191 |
+ extern const char s_stateVariable[];
|
|
|
192 |
+ extern const char s_serviceStateTable[];
|
|
|
193 |
+ extern const char s_service[];
|
|
|
194 |
+ extern const char s_serviceList[];
|
|
|
195 |
+ extern const char s_device[];
|
|
|
196 |
+ extern const char s_deviceList[];
|
|
|
197 |
+ const char s_argument[] = "argument";
|
|
|
198 |
+ const char s_argumentList[] = "argumentList";
|
|
|
199 |
+ const char s_action[] = "action";
|
|
|
200 |
+ const char s_actionList[] = "actionList";
|
|
|
201 |
+ const char s_allowedValue[] = "allowedValue";
|
|
|
202 |
+ const char s_allowedValueList[] = "allowedValueList";
|
|
|
203 |
+ const char s_stateVariable[] = "stateVariable";
|
|
|
204 |
+ const char s_serviceStateTable[] = "serviceStateTable";
|
|
|
205 |
+ const char s_service[] = "service";
|
|
|
206 |
+ const char s_serviceList[] = "serviceList";
|
|
|
207 |
+ const char s_device[] = "device";
|
|
|
208 |
+ const char s_deviceList[] = "deviceList";
|
|
|
209 |
#else // UPNP_C
|
|
|
210 |
- extern char s_argument[];
|
|
|
211 |
- extern char s_argumentList[];
|
|
|
212 |
- extern char s_action[];
|
|
|
213 |
- extern char s_actionList[];
|
|
|
214 |
- extern char s_allowedValue[];
|
|
|
215 |
- extern char s_allowedValueList[];
|
|
|
216 |
- extern char s_stateVariable[];
|
|
|
217 |
- extern char s_serviceStateTable[];
|
|
|
218 |
- extern char s_service[];
|
|
|
219 |
- extern char s_serviceList[];
|
|
|
220 |
- extern char s_device[];
|
|
|
221 |
- extern char s_deviceList[];
|
|
|
222 |
+ extern const char s_argument[];
|
|
|
223 |
+ extern const char s_argumentList[];
|
|
|
224 |
+ extern const char s_action[];
|
|
|
225 |
+ extern const char s_actionList[];
|
|
|
226 |
+ extern const char s_allowedValue[];
|
|
|
227 |
+ extern const char s_allowedValueList[];
|
|
|
228 |
+ extern const char s_stateVariable[];
|
|
|
229 |
+ extern const char s_serviceStateTable[];
|
|
|
230 |
+ extern const char s_service[];
|
|
|
231 |
+ extern const char s_serviceList[];
|
|
|
232 |
+ extern const char s_device[];
|
|
|
233 |
+ extern const char s_deviceList[];
|
|
|
234 |
#endif // UPNP_C
|
|
|
235 |
|
|
|
236 |
|
|
|
237 |
@@ -546,9 +558,9 @@
|
|
|
238 |
};
|
|
|
239 |
|
|
|
240 |
|
|
|
241 |
-typedef std::map<const std::string, CUPnPRootDevice *> RootDeviceMap;
|
|
|
242 |
-typedef std::map<const std::string, CUPnPService *> ServiceMap;
|
|
|
243 |
-typedef std::map<const std::string, CUPnPPortMapping> PortMappingMap;
|
|
|
244 |
+typedef std::map<std::string, CUPnPRootDevice *> RootDeviceMap;
|
|
|
245 |
+typedef std::map<std::string, CUPnPService *> ServiceMap;
|
|
|
246 |
+typedef std::map<std::string, CUPnPPortMapping> PortMappingMap;
|
|
|
247 |
|
|
|
248 |
|
|
|
249 |
class CUPnPControlPoint
|
|
|
250 |
--- aMule-2.2.2/src/PrefsUnifiedDlg.cpp.orig Fri Sep 26 23:57:58 2008
|
|
|
251 |
+++ aMule-2.2.2/src/PrefsUnifiedDlg.cpp Fri Sep 26 23:59:08 2008
|
|
|
252 |
@@ -516,7 +516,7 @@
|
|
|
253 |
if ((CPath::GetFileSize(theApp->ConfigDir + wxT("addresses.dat")) == 0) &&
|
|
|
254 |
CastChild(IDC_AUTOSERVER, wxCheckBox)->IsChecked() ) {
|
|
|
255 |
thePrefs::UnsetAutoServerStart();
|
|
|
256 |
- wxMessageBox(wxString::wxString( _("Your Auto-update server list is empty.\n'Auto-update server list at startup will be disabled.")),
|
|
|
257 |
+ wxMessageBox(_("Your Auto-update server list is empty.\n'Auto-update server list at startup will be disabled."),
|
|
|
258 |
_("Message"), wxOK | wxICON_INFORMATION, this);
|
|
|
259 |
}
|
|
|
260 |
|
|
|
261 |
@@ -606,8 +606,8 @@
|
|
|
262 |
}
|
|
|
263 |
|
|
|
264 |
if (!thePrefs::GetNetworkED2K() && !thePrefs::GetNetworkKademlia()) {
|
|
|
265 |
- wxMessageBox(wxString::wxString(
|
|
|
266 |
- _("Both eD2k and Kad network are disabled.\nYou won't be able to connect until you enable at least one of them.")));
|
|
|
267 |
+ wxMessageBox(
|
|
|
268 |
+ _("Both eD2k and Kad network are disabled.\nYou won't be able to connect until you enable at least one of them."));
|
|
|
269 |
}
|
|
|
270 |
|
|
|
271 |
if (thePrefs::GetNetworkKademlia() && thePrefs::IsUDPDisabled()) {
|
|
|
272 |
@@ -698,7 +698,7 @@
|
|
|
273 |
case IDC_AUTOSERVER:
|
|
|
274 |
if ((CPath::GetFileSize(theApp->ConfigDir + wxT("addresses.dat")) == 0) &&
|
|
|
275 |
CastChild(event.GetId(), wxCheckBox)->IsChecked() ) {
|
|
|
276 |
- wxMessageBox(wxString::wxString( _("Your Auto-update servers list is in blank.\nPlease fill in at least one URL to point to a valid server.met file.\nClick on the button \"List\" by this checkbox to enter an URL.")),
|
|
|
277 |
+ wxMessageBox(_("Your Auto-update servers list is in blank.\nPlease fill in at least one URL to point to a valid server.met file.\nClick on the button \"List\" by this checkbox to enter an URL."),
|
|
|
278 |
_("Message"), wxOK | wxICON_INFORMATION);
|
|
|
279 |
CastChild(event.GetId(), wxCheckBox)->SetValue(false);
|
|
|
280 |
}
|
|
|
281 |
--- aMule-2.2.2/src/extern/wxWidgets/listctrl.cpp.orig Sat Sep 27 00:03:07 2008
|
|
|
282 |
+++ aMule-2.2.2/src/extern/wxWidgets/listctrl.cpp Sat Sep 27 00:04:09 2008
|
|
|
283 |
@@ -94,6 +94,8 @@
|
|
|
284 |
// the space between the image and the text in the report mode in header
|
|
|
285 |
static const int HEADER_IMAGE_MARGIN_IN_REPORT_MODE = 2;
|
|
|
286 |
|
|
|
287 |
+const wxChar wxListCtrlNameStr[] = wxT("listCtrl");
|
|
|
288 |
+
|
|
|
289 |
// ============================================================================
|
|
|
290 |
// private classes
|
|
|
291 |
// ============================================================================
|
|
|
292 |
--- aMule-2.2.2/src/OtherStructs.h.orig Sat Sep 27 00:07:16 2008
|
|
|
293 |
+++ aMule-2.2.2/src/OtherStructs.h Sat Sep 27 00:06:45 2008
|
|
|
294 |
@@ -33,7 +33,7 @@
|
|
|
295 |
|
|
|
296 |
|
|
|
297 |
// SERVER TO CLIENT
|
|
|
298 |
-#ifdef _MSC_VER
|
|
|
299 |
+#if defined(_MSC_VER) || defined(__SUNPRO_CC)
|
|
|
300 |
#pragma pack(1)
|
|
|
301 |
#endif
|
|
|
302 |
struct Header_Struct{
|
|
|
303 |
@@ -41,7 +41,7 @@
|
|
|
304 |
int32 packetlength;
|
|
|
305 |
int8 command;
|
|
|
306 |
}
|
|
|
307 |
-#ifdef _MSC_VER
|
|
|
308 |
+#if defined(_MSC_VER) || defined(__SUNPRO_CC)
|
|
|
309 |
;
|
|
|
310 |
#pragma pack()
|
|
|
311 |
#else
|
|
|
312 |
@@ -48,7 +48,7 @@
|
|
|
313 |
__attribute__((__packed__));
|
|
|
314 |
#endif
|
|
|
315 |
|
|
|
316 |
-#ifdef _MSC_VER
|
|
|
317 |
+#if defined(_MSC_VER) || defined(__SUNPRO_CC)
|
|
|
318 |
#pragma pack(1)
|
|
|
319 |
#endif
|
|
|
320 |
struct UDP_Header_Struct {
|
|
|
321 |
@@ -55,7 +55,7 @@
|
|
|
322 |
int8 eDonkeyID;
|
|
|
323 |
int8 command;
|
|
|
324 |
}
|
|
|
325 |
-#ifdef _MSC_VER
|
|
|
326 |
+#if defined(_MSC_VER) || defined(__SUNPRO_CC)
|
|
|
327 |
;
|
|
|
328 |
#pragma pack()
|
|
|
329 |
#else
|
|
|
330 |
@@ -62,7 +62,7 @@
|
|
|
331 |
__attribute__((__packed__));
|
|
|
332 |
#endif
|
|
|
333 |
|
|
|
334 |
-#ifdef _MSC_VER
|
|
|
335 |
+#if defined(_MSC_VER) || defined(__SUNPRO_CC)
|
|
|
336 |
;
|
|
|
337 |
#pragma pack(1)
|
|
|
338 |
#endif
|
|
|
339 |
@@ -73,7 +73,7 @@
|
|
|
340 |
unsigned char FileID[16];
|
|
|
341 |
uint32 transferred; // Barry - This counts bytes completed
|
|
|
342 |
}
|
|
|
343 |
-#ifdef _MSC_VER
|
|
|
344 |
+#if defined(_MSC_VER) || defined(__SUNPRO_CC)
|
|
|
345 |
;
|
|
|
346 |
#pragma pack()
|
|
|
347 |
#else
|
|
|
348 |
@@ -85,7 +85,7 @@
|
|
|
349 |
uint32 lastasked;
|
|
|
350 |
uint8 badrequests;
|
|
|
351 |
}
|
|
|
352 |
-#ifdef _MSC_VER
|
|
|
353 |
+#if defined(_MSC_VER) || defined(__SUNPRO_CC)
|
|
|
354 |
;
|
|
|
355 |
#pragma pack()
|
|
|
356 |
#else
|
|
|
357 |
@@ -105,7 +105,7 @@
|
|
|
358 |
uint64 end;
|
|
|
359 |
};
|
|
|
360 |
|
|
|
361 |
-#ifdef _MSC_VER
|
|
|
362 |
+#if defined(_MSC_VER) || defined(__SUNPRO_CC)
|
|
|
363 |
#pragma pack(1)
|
|
|
364 |
#endif
|
|
|
365 |
struct ServerMet_Struct {
|
|
|
366 |
@@ -113,7 +113,7 @@
|
|
|
367 |
uint16 port;
|
|
|
368 |
uint32 tagcount;
|
|
|
369 |
}
|
|
|
370 |
-#ifdef _MSC_VER
|
|
|
371 |
+#if defined(_MSC_VER) || defined(__SUNPRO_CC)
|
|
|
372 |
;
|
|
|
373 |
#pragma pack()
|
|
|
374 |
#else
|
|
|
375 |
@@ -128,7 +128,7 @@
|
|
|
376 |
|
|
|
377 |
//Kry import of 0.30d
|
|
|
378 |
// Maella -Enhanced Chunk Selection- (based on jicxicmic)
|
|
|
379 |
-#ifdef _MSC_VER
|
|
|
380 |
+#if defined(_MSC_VER) || defined(__SUNPRO_CC)
|
|
|
381 |
#pragma pack(1)
|
|
|
382 |
#endif
|
|
|
383 |
struct Chunk {
|
|
|
384 |
@@ -138,7 +138,7 @@
|
|
|
385 |
uint16 rank; // Download priority factor (highest = 0, lowest = 0xffff)
|
|
|
386 |
};
|
|
|
387 |
}
|
|
|
388 |
-#ifdef _MSC_VER
|
|
|
389 |
+#if defined(_MSC_VER) || defined(__SUNPRO_CC)
|
|
|
390 |
;
|
|
|
391 |
#pragma pack()
|
|
|
392 |
#else
|
|
|
393 |
--- aMule-2.2.2/src/SafeFile.cpp.orig Fri Sep 26 18:53:06 2008
|
|
|
394 |
+++ aMule-2.2.2/src/SafeFile.cpp Sat Sep 27 00:23:28 2008
|
|
|
395 |
@@ -28,6 +28,9 @@
|
|
|
396 |
#include "kademlia/utils/UInt128.h" // Needed for CUInt128
|
|
|
397 |
#include "ScopedPtr.h" // Needed for CScopedPtr and CScopedArray
|
|
|
398 |
|
|
|
399 |
+#if defined(__SUNPRO_CC)
|
|
|
400 |
+#define __FUNCTION__ __FILE__+__LINE__
|
|
|
401 |
+#endif
|
|
|
402 |
|
|
|
403 |
#define CHECK_BOM(size, x) ((size >= 3) && (x[0] == (char)0xEF) && (x[1] == (char)0xBB) && (x[2] == (char)0xBF))
|
|
|
404 |
|
|
|
405 |
--- aMule-2.2.2/src/kademlia/kademlia/SearchManager.cpp.orig Fri Sep 26 18:27:51 2008
|
|
|
406 |
+++ aMule-2.2.2/src/kademlia/kademlia/SearchManager.cpp Sat Sep 27 00:25:52 2008
|
|
|
407 |
@@ -49,6 +49,10 @@
|
|
|
408 |
|
|
|
409 |
#include <wx/tokenzr.h>
|
|
|
410 |
|
|
|
411 |
+#if defined(__SUNPRO_CC)
|
|
|
412 |
+#define __FUNCTION__ __FILE__+__LINE__
|
|
|
413 |
+#endif
|
|
|
414 |
+
|
|
|
415 |
////////////////////////////////////////
|
|
|
416 |
using namespace Kademlia;
|
|
|
417 |
////////////////////////////////////////
|
|
|
418 |
--- aMule-2.2.2/src/Tag.cpp.orig Fri Sep 26 18:53:36 2008
|
|
|
419 |
+++ aMule-2.2.2/src/Tag.cpp Sat Sep 27 00:28:15 2008
|
|
|
420 |
@@ -30,6 +30,10 @@
|
|
|
421 |
#include "SafeFile.h" // Needed for CFileDataIO
|
|
|
422 |
#include "MD4Hash.h" // Needed for CMD4Hash
|
|
|
423 |
|
|
|
424 |
+#if defined(__SUNPRO_CC)
|
|
|
425 |
+#define __FUNCTION__ __FILE__+__LINE__
|
|
|
426 |
+#endif
|
|
|
427 |
+
|
|
|
428 |
///////////////////////////////////////////////////////////////////////////////
|
|
|
429 |
// CTag
|
|
|
430 |
|
|
|
431 |
--- aMule-2.2.2/src/DownloadQueue.cpp.orig Fri Sep 26 19:16:49 2008
|
|
|
432 |
+++ aMule-2.2.2/src/DownloadQueue.cpp Sat Sep 27 00:39:33 2008
|
|
|
433 |
@@ -1452,7 +1452,7 @@
|
|
|
434 |
{
|
|
|
435 |
wxMutexLocker lock(m_mutex);
|
|
|
436 |
list.reserve( m_filelist.size() );
|
|
|
437 |
- list.insert( list.begin(), m_filelist.begin(), m_filelist.end() );
|
|
|
438 |
+ list.insert( list.begin(), m_filelist.size(), *m_filelist.begin() );
|
|
|
439 |
}
|
|
|
440 |
|
|
|
441 |
NotifyObservers( EventType( EventType::INITIAL, &list ), o );
|