summaryrefslogtreecommitdiff
path: root/open-vm-tools/modules/linux/shared/vmciKernelAPI1.h
diff options
context:
space:
mode:
Diffstat (limited to 'open-vm-tools/modules/linux/shared/vmciKernelAPI1.h')
-rw-r--r--open-vm-tools/modules/linux/shared/vmciKernelAPI1.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/open-vm-tools/modules/linux/shared/vmciKernelAPI1.h b/open-vm-tools/modules/linux/shared/vmciKernelAPI1.h
index 10ce7912..dc528180 100644
--- a/open-vm-tools/modules/linux/shared/vmciKernelAPI1.h
+++ b/open-vm-tools/modules/linux/shared/vmciKernelAPI1.h
@@ -91,7 +91,11 @@ VMCIId vmci_get_context_id(void);
#if defined(linux) && !defined(VMKERNEL)
/* Returned value is a bool, 0 for false, 1 for true. */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+int vmci_is_context_owner(VMCIId contextID, kuid_t uid);
+#else
int vmci_is_context_owner(VMCIId contextID, uid_t uid);
+#endif
#else // !linux || VMKERNEL
/* Returned value is a VMCI error code. */
int vmci_is_context_owner(VMCIId contextID, void *hostUser);
@@ -140,9 +144,9 @@ ssize_t vmci_qpair_dequeue(VMCIQPair *qpair, void *buf, size_t bufSize,
int mode);
ssize_t vmci_qpair_peek(VMCIQPair *qpair, void *buf, size_t bufSize, int mode);
-#if defined (SOLARIS) || (defined(__APPLE__) && !defined (VMX86_TOOLS)) || \
- (defined(__linux__) && defined(__KERNEL__)) || \
- (defined(_WIN32) && defined(WINNT_DDK))
+#if (defined(__APPLE__) && !defined (VMX86_TOOLS)) || \
+ (defined(__linux__) && defined(__KERNEL__)) || \
+ (defined(_WIN32) && defined(WINNT_DDK))
/*
* Environments that support struct iovec
*/