From 3f199fcf6242fc0cc0e4e767ce2a505792d80fef Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 14 May 2006 01:28:31 +0200
Subject: Added a closesocket() that properly removes event handlers before
 closing a socket.

---
 sock.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sock.h')

diff --git a/sock.h b/sock.h
index 28d31de9..ff7034a6 100644
--- a/sock.h
+++ b/sock.h
@@ -17,7 +17,9 @@
 #define sock_make_nonblocking(fd) fcntl(fd, F_SETFL, O_NONBLOCK)
 #define sock_make_blocking(fd) fcntl(fd, F_SETFL, 0)
 #define sockerr_again() (errno == EINPROGRESS || errno == EINTR)
+#ifndef EVENTS_LIBEVENT
 #define closesocket(a) close(a)
+#endif
 #else
 # include <winsock2.h>
 # ifndef _MSC_VER
-- 
cgit v1.2.3


From b0a33a50735d93e1414a2e6c2007884d756429a3 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Tue, 11 Jul 2006 11:28:44 +0200
Subject: Better handling of situations where IPv6 is not available at
 run-time.

---
 sock.h | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'sock.h')

diff --git a/sock.h b/sock.h
index ff7034a6..c3c0428e 100644
--- a/sock.h
+++ b/sock.h
@@ -1,13 +1,6 @@
 #include <errno.h>
 #include <fcntl.h>
 
-/* To cut down on the ifdef stuff a little bit in other places */
-#ifdef IPV6
-#define AF_INETx AF_INET6
-#else
-#define AF_INETx AF_INET
-#endif
-
 #ifndef _WIN32
 #include <unistd.h>
 #include <sys/socket.h>
-- 
cgit v1.2.3