3 files changed, 12 insertions, 80 deletions

diff --git a/net/xmule/files/patch-src::gsocket.c b/net/xmule/files/patch-src::gsocket.c
deleted file mode 100644
index 06f7483b3a82..000000000000
--- a/net/xmule/files/patch-src::gsocket.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/gsocket.c.orig	Tue May 27 14:11:08 2003
-+++ src/gsocket.c	Tue May 27 14:11:58 2003
-@@ -127,6 +127,11 @@
- #  define GSocket_Debug(args)
- #endif /* __GSOCKET_DEBUG__ */
- 
-+/* Added by Un-Thesis 2003-05-15 */
-+/* Allows socket reuse */
-+/* Code contributed by McCabe and arkanes */
-+int intYes = 1;
-+
- /* Global initialisers */
- 
- int GSocket_Init(void)
-@@ -400,7 +405,6 @@
- /* Added by Un-Thesis 2003-05-15 */
- /* Allows socket reuse */
- /* Code contributed by McCabe and arkanes */
--int intYes = 1;
- if(setsockopt(sck->m_fd, SOL_SOCKET, SO_REUSEADDR, &intYes, sizeof(int))) {
- 	return GSOCK_IOERR;
- }
diff --git a/net/xmule/files/patch-src::updownclient.h b/net/xmule/files/patch-src::updownclient.h
deleted file mode 100644
index 9891c50e1d6b..000000000000
--- a/net/xmule/files/patch-src::updownclient.h
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/updownclient.h.orig	Sun May 25 18:27:59 2003
-+++ src/updownclient.h	Tue May 27 21:14:31 2003
-@@ -26,12 +26,20 @@
- #include "SafeFile.h"
- #include "BarShader.h"
- #include "otherfunctions.h"
-+#include <sys/time.h>
- 
- class CPartFile;
- class CKnownFile;
- typedef unsigned char byte;
--extern inline long GetTickCount();
- 
-+inline long GetTickCount()
-+{
-+  struct timeval aika;
-+  gettimeofday(&aika,NULL);
-+  unsigned long secs=aika.tv_sec*1000;
-+  secs+=(aika.tv_usec/1000);
-+  return secs;
-+}
- 
- // uploadstate
- #define	US_UPLOADING		0
diff --git a/net/xmule/files/patch-src::xmule.cpp b/net/xmule/files/patch-src::xmule.cpp
index 8e4ba4ff0ed1..09480748d421 100644
--- a/net/xmule/files/patch-src::xmule.cpp
+++ b/net/xmule/files/patch-src::xmule.cpp
@@ -1,42 +1,20 @@
---- src/xmule.cpp.orig	Tue May 27 00:02:47 2003
-+++ src/xmule.cpp	Tue May 27 21:31:38 2003
-@@ -55,16 +55,6 @@
- //	ON_COMMAND(ID_HELP, CWinApp::OnHelp)
- //END_MESSAGE_MAP()
- 
--#include <sys/time.h>
--inline long GetTickCount()
--{	
--  struct timeval aika;
--  gettimeofday(&aika,NULL);
--  unsigned long secs=aika.tv_sec*1000;
--  secs+=(aika.tv_usec/1000);
--  return secs;
--}
--
- CxmuleApp::CxmuleApp() {
-   splashBmp=new wxBitmap((const char**)About_jpg);
+--- src/xmule.cpp.orig	Mon Aug 11 14:38:14 2003
++++ src/xmule.cpp	Mon Aug 11 14:38:27 2003
+@@ -763,7 +763,7 @@
+ 	delete[] xmulesig_path;
  }
-@@ -641,11 +631,13 @@
-     
- } //End Added By Bouc7
  
--
+-#if defined(__Linux__)
 +#if 0
  #include <execinfo.h>
-+#endif
+ #endif
+ 
+@@ -776,7 +776,7 @@
+     	theApp.clientudp->Destroy();
  
- void CxmuleApp::OnFatalException()
- {
-+#if 0
      // (stkn) create backtrace
+-#if defined(__Linux__)
++#if 0
      void * bt_array[100]; // 100 should be enough ?!?
      char ** bt_strings;
-@@ -666,6 +658,7 @@
-        fprintf(stderr, "[%d] %s\n", i, bt_strings[i]);
-        
-     free(bt_strings);
-+#endif
- }
- 
- #define wxGTK_WINDOW 1
+     int num_entries;