From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 18 Dec 2018 21:19:47 +0000 (-0800)
Subject: Remove erroneous defines of __FreeBSD__ & __VMKTCPIP__ from vmci_sockets.h
X-Git-Tag: stable-11.0.0~285
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbcb8a46876352e120d22ee07bae26be29ec27c3;p=thirdparty%2Fopen-vm-tools.git

Remove erroneous defines of __FreeBSD__ & __VMKTCPIP__ from vmci_sockets.h
---

diff --git a/open-vm-tools/lib/include/vmci_sockets.h b/open-vm-tools/lib/include/vmci_sockets.h
index 29e80780d..72cbf7c1a 100644
--- a/open-vm-tools/lib/include/vmci_sockets.h
+++ b/open-vm-tools/lib/include/vmci_sockets.h
@@ -39,7 +39,7 @@
 #  if defined(__APPLE__)
 #    include <sys/socket.h>
 #    include <string.h>
-#  elif defined(__FreeBSD__)
+#  elif defined(__FreeBSD__) && !defined(__VMKTCPIP__)
 #     include <sys/socket.h>
 #  endif // __FreeBSD__
 #endif // linux && !VMKERNEL