From dd6dba9d4ed7acb41f693e5b01dfbdd6b8d8f7e3 Mon Sep 17 00:00:00 2001
From: oddsock <oddsock@xiph.org>
Date: Sat, 23 Nov 2002 15:55:27 +0000
Subject: [PATCH] win32 port updates to recent changes

svn path=/trunk/net/; revision=4117
---
 net/sock.c | 4 +++-
 net/sock.h | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/net/sock.c b/net/sock.c
index 4e776c9..4b7a21c 100644
--- a/net/sock.c
+++ b/net/sock.c
@@ -41,7 +41,9 @@
 #define vsnprintf _vsnprintf
 #define EINPROGRESS WSAEINPROGRESS
 #define ENOTSOCK WSAENOTSOCK
-#define EWOULDBLOCK WSAEWOULDBLOCK
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#define EALREADY WSAEALREADY
+#define socklen_t	int
 #endif
 
 #include "sock.h"
diff --git a/net/sock.h b/net/sock.h
index 9b79407..470934b 100644
--- a/net/sock.h
+++ b/net/sock.h
@@ -22,11 +22,14 @@
 #ifndef __SOCK_H
 #define __SOCK_H
 
-#include <unistd.h>
 
 #ifdef _WIN32
 #include <winsock2.h>
-#endif
+#else
+#include <unistd.h>
+#endif
+
+#include <os.h>
 
 #ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>