VThreadID: change to uintptr_t

diff --git a/open-vm-tools/lib/include/vthreadBase.h b/open-vm-tools/lib/include/vthreadBase.h
index c9a44f8e76ce3dabd753898097e266d7e3ef4693..33b3065a88ab50089aef1433211eb6c52b518b9d 100644 (file)
--- a/open-vm-tools/lib/include/vthreadBase.h
+++ b/open-vm-tools/lib/include/vthreadBase.h
@@ -82,7 +82,7 @@ extern "C" {
  * Types
  */
 
-typedef uint64 VThreadID;
+typedef uintptr_t VThreadID;
 
 #define VTHREAD_INVALID_ID    (VThreadID)(0)
 

diff --git a/open-vm-tools/lib/misc/vthreadBase.c b/open-vm-tools/lib/misc/vthreadBase.c
index cbe163177be4c0475fb86c8c92beae9a1bb4dcdc..78d65b0faee3be1c2e620aa6bea8d54d62f4d2c5 100644 (file)
--- a/open-vm-tools/lib/misc/vthreadBase.c
+++ b/open-vm-tools/lib/misc/vthreadBase.c
@@ -250,7 +250,7 @@ VThreadBaseGetStableID(void)
 VThreadID
 VThreadBase_CurID(void)
 {
-   return (VThreadID)VThreadBaseGetStableID();
+   return VThreadBaseGetStableID();
 }
 
 
@@ -563,7 +563,7 @@ void
 VThreadBase_ForgetSelf(void)
 {
    if (vmx86_debug) {
-      Log("Forgetting VThreadID %" FMT64 "d (\"%s\").\n",
+      Log("Forgetting VThreadID %" FMTPD "d (\"%s\").\n",
           VThread_CurID(), VThread_CurName());
    }