From: VMware, Inc <>
Date: Thu, 27 Oct 2011 18:39:22 +0000 (-0700)
Subject: Fix Windows VMCI/vSockets build.
X-Git-Tag: 2011.10.26-514583~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d838d11acea0c01872bcfd3deed744c4b7823692;p=thirdparty%2Fopen-vm-tools.git

Fix Windows VMCI/vSockets build.

The recent non-blocking change left out the extra "canBlock"
parameter from the Windows-specific code.  It was also missing
the declaration for TryAcquire() and the definition of EAGAIN.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/modules/linux/vsock/linux/vsockSocketWrapper.h b/open-vm-tools/modules/linux/vsock/linux/vsockSocketWrapper.h
index 114ec9a6c..3517dcc9d 100644
--- a/open-vm-tools/modules/linux/vsock/linux/vsockSocketWrapper.h
+++ b/open-vm-tools/modules/linux/vsock/linux/vsockSocketWrapper.h
@@ -125,6 +125,9 @@
 # if !defined(ENOSYS)
 #  define ENOSYS              WSAEOPNOTSUPP
 # endif
+# if !defined(EAGAIN)
+#  define EAGAIN              WSAEWOULDBLOCK
+# endif
 #  define EWOULDBLOCK         WSAEWOULDBLOCK
 #  define EINPROGRESS         WSAEINPROGRESS
 #  define EALREADY            WSAEALREADY