From 8f8816b092e06fee069805153b832afbb9ca2ef8 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Tue, 30 Sep 2014 01:02:12 +0100
Subject: [PATCH] Fix conditional compilation, add headers.

---
 lib/mosquitto.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/mosquitto.c b/lib/mosquitto.c
index d7b51e40..1d347ba6 100644
--- a/lib/mosquitto.c
+++ b/lib/mosquitto.c
@@ -462,9 +462,12 @@ static int _mosquitto_reconnect(struct mosquitto *mosq, bool blocking)
 	if(!mosq->host || mosq->port <= 0) return MOSQ_ERR_INVAL;
 
 	pthread_mutex_lock(&mosq->state_mutex);
+#ifdef WITH_SOCKS
 	if(mosq->socks5_host){
 		mosq->state = mosq_cs_socks5_new;
-	}else{
+	}else
+#endif
+	{
 		mosq->state = mosq_cs_new;
 	}
 	pthread_mutex_unlock(&mosq->state_mutex);
@@ -502,18 +505,24 @@ static int _mosquitto_reconnect(struct mosquitto *mosq, bool blocking)
 
 	_mosquitto_messages_reconnect_reset(mosq);
 
+#ifdef WITH_SOCKS
 	if(mosq->socks5_host){
 		rc = _mosquitto_socket_connect(mosq, mosq->socks5_host, mosq->socks5_port, mosq->bind_address, blocking);
-	}else{
+	}else
+#endif
+	{
 		rc = _mosquitto_socket_connect(mosq, mosq->host, mosq->port, mosq->bind_address, blocking);
 	}
 	if(rc){
 		return rc;
 	}
 
+#ifdef WITH_SOCKS
 	if(mosq->socks5_host){
 		return mosquitto__socks5_send(mosq);
-	}else{
+	}else
+#endif
+	{
 		return _mosquitto_send_connect(mosq, mosq->keepalive, mosq->clean_session);
 	}
 }
@@ -1089,9 +1098,12 @@ int mosquitto_loop_read(struct mosquitto *mosq, int max_packets)
 	 * have QoS > 0. We should try to deal with that many in this loop in order
 	 * to keep up. */
 	for(i=0; i<max_packets; i++){
+#ifdef WITH_SOCKS
 		if(mosq->socks5_host){
 			rc = mosquitto__socks5_read(mosq);
-		}else{
+		}else
+#endif
+		{
 			rc = _mosquitto_packet_read(mosq);
 		}
 		if(rc || errno == EAGAIN || errno == COMPAT_EWOULDBLOCK){