From 5beaf15f217e33e32a02eb84b4c40d7e514b06d7 Mon Sep 17 00:00:00 2001
From: TingPing <tingping@tingping.se>
Date: Sun, 28 Dec 2014 13:57:36 -0500
Subject: Remove option to use socks5 library

This was always disabled by default and is not required
for the current socks support. I am not even sure this
library is packaged by any distro?
---
 src/common/hexchat.c | 4 ----
 src/common/hexchat.h | 8 --------
 src/common/util.c    | 3 ---
 3 files changed, 15 deletions(-)

(limited to 'src/common')

diff --git a/src/common/hexchat.c b/src/common/hexchat.c
index 7db7e6ca..021c5838 100644
--- a/src/common/hexchat.c
+++ b/src/common/hexchat.c
@@ -1038,10 +1038,6 @@ main (int argc, char *argv[])
 	/* we MUST do this after load_config () AND before fe_init (thus gtk_init) otherwise it will fail */
 	set_locale ();
 
-#ifdef SOCKS
-	SOCKSinit (argv[0]);
-#endif
-
 	ret = fe_args (argc, argv);
 	if (ret != -1)
 		return ret;
diff --git a/src/common/hexchat.h b/src/common/hexchat.h
index e914da27..c1acfe45 100644
--- a/src/common/hexchat.h
+++ b/src/common/hexchat.h
@@ -38,14 +38,6 @@
 
 #include "history.h"
 
-#ifdef SOCKS
-#ifdef __sgi
-#include <sys/time.h>
-#define INCLUDE_PROTOTYPES 1
-#endif
-#include <socks.h>
-#endif
-
 #ifdef USE_OPENSSL
 #include <openssl/ssl.h>		  /* SSL_() */
 #endif
diff --git a/src/common/util.c b/src/common/util.c
index 9deec8c2..37d214c0 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -51,9 +51,6 @@
 #if defined (USING_FREEBSD) || defined (__APPLE__)
 #include <sys/sysctl.h>
 #endif
-#ifdef SOCKS
-#include <socks.h>
-#endif
 
 /* SASL mechanisms */
 #ifdef USE_OPENSSL
-- 
cgit 1.4.1