Align with legacy_6x.

* Normalize include order.
* Backport missed bug fixes.
* Remove dead code.

1 files changed, 0 insertions, 1 deletions

diff --git a/socket.h b/socket.h
index 0c4ac001..d2a5ef1d 100644
--- a/socket.h
+++ b/socket.h
@@ -20,7 +20,6 @@ struct addrinfo;
 /** Create a new client socket; returns -1 on error */
 int SockOpen(const char *host, const char *service, const char *plugin, struct addrinfo **);
 
-
 /** 
 Get a string terminated by an '\n' (matches interface of fgets).
 Pass it a valid socket, a buffer for the string, and