Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[tinc] / src / utils.h

diff --git a/lib/utils.h b/src/utils.h
similarity index 95%
rename from lib/utils.h
rename to src/utils.h
index f6ff705..6f00e5a 100644 (file)
--- a/lib/utils.h
+++ b/src/utils.h
@@ -32,12 +32,14 @@ extern const char *winerror(int);
 #define sockwouldblock(x) ((x) == WSAEWOULDBLOCK || (x) == WSAEINTR)
 #define sockmsgsize(x) ((x) == WSAEMSGSIZE)
 #define sockinprogress(x) ((x) == WSAEINPROGRESS || (x) == WSAEWOULDBLOCK)
+#define sockinuse(x) ((x) == WSAEADDRINUSE)
 #else
 #define sockerrno errno
 #define sockstrerror(x) strerror(x)
 #define sockwouldblock(x) ((x) == EWOULDBLOCK || (x) == EINTR)
 #define sockmsgsize(x) ((x) == EMSGSIZE)
 #define sockinprogress(x) ((x) == EINPROGRESS)
+#define sockinuse(x) ((x) == EADDRINUSE)
 #endif
 
 extern unsigned int bitfield_to_int(const void *bitfield, size_t size);