From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:53 +0000 (-0700)
Subject: VThreadID: change to uintptr_t
X-Git-Tag: stable-10.2.0~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e28fabf2876cd256b80ad863a0d610d103fd121e;p=thirdparty%2Fopen-vm-tools.git

VThreadID: change to uintptr_t
---

diff --git a/open-vm-tools/lib/include/vthreadBase.h b/open-vm-tools/lib/include/vthreadBase.h
index c9a44f8e7..33b3065a8 100644
--- 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 cbe163177..78d65b0fa 100644
--- 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());
    }