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 388a2e27bbec48db059a2d548ce8a6f5999924cd..b9226f8ccd3eeff82f2c6df75e4a75f9a8733fcd 100644 (file)
--- 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 2106de7b4a1cd1e388a4302cc2b7377642f00824..a2d5f908395e7a5803e15e577c69838cbc9c0140 100644 (file)
--- 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 e42e18d05588df760b238b2fa613fb57c430cc3b..2f70b5222ba1f4c717321085073723e480dfe2ef 100644 (file)
--- 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 b04b7ab14bf9958dadccbfc35533eda3f77d8f13..392efc3758a2d5b0e0ec555644a83b49e95f8298 100644 (file)
--- 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)