From: VMware, Inc <>
Date: Mon, 26 Jul 2010 18:15:32 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2010.07.25-280253~96
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f68bcd200ae0f47358ad1843e4836133232eccd6;p=thirdparty%2Fopen-vm-tools.git

Changes in shared code that don't affect open-vm-tools functionality.

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

diff --git a/open-vm-tools/lib/include/vm_basic_defs.h b/open-vm-tools/lib/include/vm_basic_defs.h
index 388a2e27b..b9226f8cc 100644
--- a/open-vm-tools/lib/include/vm_basic_defs.h
+++ b/open-vm-tools/lib/include/vm_basic_defs.h
@@ -620,7 +620,7 @@ typedef int pid_t;
 #ifdef _WIN32
 #define VMW_INVALID_HANDLE INVALID_HANDLE_VALUE
 #else
-#define VMW_INVALID_HANDLE (-1)
+#define VMW_INVALID_HANDLE (-1LL)
 #endif
 
 #ifdef _WIN32
diff --git a/open-vm-tools/lib/include/vm_basic_types.h b/open-vm-tools/lib/include/vm_basic_types.h
index 2106de7b4..a2d5f9083 100644
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -989,11 +989,7 @@ typedef int MXSemaHandle;
  * Define type for poll device handles.
  */
 
-#ifdef _WIN32
-typedef uintptr_t PollDevHandle;
-#else
-typedef int PollDevHandle;
-#endif
+typedef int64 PollDevHandle;
 
 /*
  * Define the utf16_t type.
diff --git a/open-vm-tools/lib/include/vmci_defs.h b/open-vm-tools/lib/include/vmci_defs.h
index e42e18d05..2f70b5222 100644
--- a/open-vm-tools/lib/include/vmci_defs.h
+++ b/open-vm-tools/lib/include/vmci_defs.h
@@ -248,7 +248,7 @@ static const VMCIHandle VMCI_INVALID_HANDLE = {VMCI_INVALID_ID,
 #define VMCI_SUCCESS_LAST_DETACH          3
 #define VMCI_SUCCESS_ACCESS_GRANTED       2
 #define VMCI_SUCCESS_ENTRY_DEAD           1
-#define VMCI_SUCCESS                      0
+#define VMCI_SUCCESS                      0LL
 #define VMCI_ERROR_INVALID_RESOURCE      (-1)
 #define VMCI_ERROR_INVALID_ARGS          (-2)
 #define VMCI_ERROR_NO_MEM                (-3)
diff --git a/open-vm-tools/modules/linux/shared/vmci_defs.h b/open-vm-tools/modules/linux/shared/vmci_defs.h
index b04b7ab14..392efc375 100644
--- a/open-vm-tools/modules/linux/shared/vmci_defs.h
+++ b/open-vm-tools/modules/linux/shared/vmci_defs.h
@@ -248,7 +248,7 @@ static const VMCIHandle VMCI_INVALID_HANDLE = {VMCI_INVALID_ID,
 #define VMCI_SUCCESS_LAST_DETACH          3
 #define VMCI_SUCCESS_ACCESS_GRANTED       2
 #define VMCI_SUCCESS_ENTRY_DEAD           1
-#define VMCI_SUCCESS                      0
+#define VMCI_SUCCESS                      0LL
 #define VMCI_ERROR_INVALID_RESOURCE      (-1)
 #define VMCI_ERROR_INVALID_ARGS          (-2)
 #define VMCI_ERROR_NO_MEM                (-3)