Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 38

aMule.spec Changed

update.diff.xz Changed

@@ -0,0 +1,2084 @@
+diff --git a/src/CFile.cpp b/src/CFile.cpp
+index 7c6f3ef..039976d 100644
+--- a/src/CFile.cpp
++++ b/src/CFile.cpp
+@@ -39,7 +39,7 @@
+ #endif
+ 
+ // standard
+-#if defined(__WINDOWS__ ) && !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)
++#if defined(__WINDOWS__) && !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)
+ #	include <io.h>
+ #	ifndef __SALFORDC__
+ #		define   WIN32_LEAN_AND_MEAN
+@@ -92,14 +92,14 @@ char* mktemp( char * path ) { return path ;}
+ #	define   O_BINARY    (0)
+ #endif  //__UNIX__
+ 
+-#ifdef __WINDOWS__ 
++#ifdef __WINDOWS__
+ #include <wx/msw/mslu.h>
+ #endif
+ 
+ 
+ // The following defines handle different names across platforms,
+ // and ensures that we use 64b IO on windows (only 32b by default).
+-#ifdef __WINDOWS__ 
++#ifdef __WINDOWS__
+ 	#define FLUSH_FD(x)			_commit(x)
+ 	#define SEEK_FD(x, y, z)		_lseeki64(x, y, z)
+ 	#define TELL_FD(x)			_telli64(x)
+@@ -271,7 +271,7 @@ bool CFile::Open(const CPath& fileName, OpenMode mode, int accessMode)
+ 	}
+ 
+ 	// Windows needs wide character file names
+-#ifdef __WINDOWS__ 
++#ifdef __WINDOWS__
+ 	m_fd = _wopen(m_filePath.GetRaw().c_str(), flags, accessMode);
+ #else
+ 	Unicode2CharBuf tmpFileName = filename2char(m_filePath.GetRaw());
+@@ -427,7 +427,7 @@ bool CFile::SetLength(uint64 new_len)
+ {
+ 	MULE_VALIDATE_STATE(IsOpened(), wxT("CFile: Cannot set length when no file is open."));
+ 
+-#ifdef __WINDOWS__ 
++#ifdef __WINDOWS__
+ #ifdef _MSC_VER
+ // MSVC has a 64bit version
+ 	bool result = _chsize_s(m_fd, new_len) == 0;
+diff --git a/src/CatDialog.cpp b/src/CatDialog.cpp
+index 9232b1a..9f66796 100644
+--- a/src/CatDialog.cpp
++++ b/src/CatDialog.cpp
+@@ -26,7 +26,7 @@
+ #include <wx/wx.h>
+ #include <wx/colordlg.h>
+ 
+-#ifdef __WINDOWS__ 
++#ifdef __WINDOWS__
+ 	#include <io.h> // Do_not_auto_remove
+ #endif
+ 
+diff --git a/src/DirectoryTreeCtrl.cpp b/src/DirectoryTreeCtrl.cpp
+index d4f1cba..1e7486e 100644
+--- a/src/DirectoryTreeCtrl.cpp
++++ b/src/DirectoryTreeCtrl.cpp
+@@ -104,7 +104,7 @@ void CDirectoryTreeCtrl::Init()
+ 					new CItemData(CPath()));
+ 
+ 	if (!m_IsRemote) {
+-	#ifndef __WINDOWS__ 
++	#ifndef __WINDOWS__
+ 		AddChildItem(m_root, CPath(wxT("/")));
+ 	#else
+ 		// this might take awhile, so change the cursor
+diff --git a/src/DownloadListCtrl.cpp b/src/DownloadListCtrl.cpp
+index 612cae3..5c5dd84 100644
+--- a/src/DownloadListCtrl.cpp
++++ b/src/DownloadListCtrl.cpp
+@@ -241,7 +241,7 @@ void CDownloadListCtrl::UpdateItem(const void* toupdate)
+ 	// support the GetVisibleLines function
+ 	long first = 0, last = GetItemCount();
+ 
+-#ifndef __WINDOWS__ 
++#ifndef __WINDOWS__
+ 	// Get visible lines if we need them
+ 	if ( rangeIt.first != rangeIt.second ) {
+ 		GetVisibleLines( &first, &last );
+@@ -1412,7 +1412,7 @@ void CDownloadListCtrl::DrawFileStatusBar(
+ 	}
+ }
+ 
+-#ifdef __WINDOWS__ 
++#ifdef __WINDOWS__
+ #	define QUOTE	wxT("\"")
+ #else
+ #	define QUOTE	wxT("\'")
+@@ -1458,7 +1458,7 @@ void CDownloadListCtrl::PreviewFile(CPartFile* file)
+ 		}
+ 	}
+ 
+-#ifndef __WINDOWS__ 
++#ifndef __WINDOWS__
+ 	// We have to escape quote characters in the file name, otherwise arbitrary
+ 	// options could be passed to the player.
+ 	partFile.Replace(QUOTE, wxT("\\") QUOTE);
+diff --git a/src/ExternalConnector.cpp b/src/ExternalConnector.cpp
+index 76d22a7..c91a73a 100644
+--- a/src/ExternalConnector.cpp
++++ b/src/ExternalConnector.cpp
+@@ -234,7 +234,7 @@ void CaMuleExternalConnector::Show(const wxString &s)
+ {
+ 	if( !m_KeepQuiet ) {
+ 		printf("%s", (const char *)unicode2char(s));
+-#ifdef __WINDOWS__ 
++#ifdef __WINDOWS__
+ 		fflush(stdout);
+ #endif
+ 	}
+@@ -554,7 +554,7 @@ void CaMuleExternalConnector::SaveConfigFile()
+ 
+ bool CaMuleExternalConnector::OnInit()
+ {
+-#ifndef __WINDOWS__ 
++#ifndef __WINDOWS__
+ 	#if wxUSE_ON_FATAL_EXCEPTION
+ 		// catch fatal exceptions
+ 		wxHandleFatalExceptions(true);
+diff --git a/src/GenericClientListCtrl.cpp b/src/GenericClientListCtrl.cpp
+index 4ed068e..19d8b3b 100644
+--- a/src/GenericClientListCtrl.cpp
++++ b/src/GenericClientListCtrl.cpp
+@@ -319,7 +319,7 @@ void CGenericClientListCtrl::UpdateItem(uint32 toupdate, SourceItemType type)
+ 		// support the GetVisibleLines function
+ 		long first = 0, last = GetItemCount();
+ 
+-	#ifndef __WINDOWS__ 
++	#ifndef __WINDOWS__
+ 		// Get visible lines if we need them
+ 		GetVisibleLines( &first, &last );
+ 	#endif
+diff --git a/src/GetTickCount.cpp b/src/GetTickCount.cpp
+index 264a1af..7aa7968 100644
+--- a/src/GetTickCount.cpp
++++ b/src/GetTickCount.cpp
+@@ -28,7 +28,7 @@
+ 
+ uint32 TheTime = 0;
+ 
+-#ifdef __WINDOWS__ 
++#ifdef __WINDOWS__
+ 
+ void StartTickTimer(){};
+ 
+diff --git a/src/IPFilter.cpp b/src/IPFilter.cpp
+index e95cd39..3ac9cca 100644
+--- a/src/IPFilter.cpp
++++ b/src/IPFilter.cpp
+@@ -115,7 +115,7 @@ private:
+ 		     thePrefs::UseIPFilterSystem() ) {
+ 			// Load from system wide IP filter file
+ 			wxStandardPathsBase &spb(wxStandardPaths::Get());
+-#ifdef __WINDOWS__ 
++#ifdef __WINDOWS__
+ 			wxString dataDir(spb.GetPluginsDir());
+ #elif defined(__WXMAC__)
+ 			wxString dataDir(spb.GetDataDir());
+diff --git a/src/IPFilterScanner.cpp b/src/IPFilterScanner.cpp
+index 206602b..7cd5ae0 100644
+--- a/src/IPFilterScanner.cpp
++++ b/src/IPFilterScanner.cpp
+@@ -53,7 +53,7 @@
+ #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+ 
+ /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+- * if you want the limit (max/min) macros for int types. 
++ * if you want the limit (max/min) macros for int types.
+  */
+ #ifndef __STDC_LIMIT_MACROS
+ #define __STDC_LIMIT_MACROS 1
+@@ -70,7 +70,7 @@ typedef uint32_t flex_uint32_t;
+ typedef signed char flex_int8_t;
+ typedef short int flex_int16_t;
+ typedef int flex_int32_t;
+-typedef unsigned char flex_uint8_t; 
++typedef unsigned char flex_uint8_t;
+ typedef unsigned short int flex_uint16_t;
+ typedef unsigned int flex_uint32_t;
+ #endif /* ! C99 */
+@@ -181,7 +181,7 @@ extern FILE *yyipin, *yyipout;
+ #define EOB_ACT_LAST_MATCH 2
+ 
+     #define YY_LESS_LINENO(n)
+-    
++
+ /* Return all but the first "n" matched characters back to the input stream. */
+ #define yyless(n) \
+ 	do \
+@@ -243,7 +243,7 @@ struct yy_buffer_state
+