From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 5 Jun 2018 22:47:37 +0000 (-0700)
Subject: Drop suffix 64 in public except vm_basic_types
X-Git-Tag: stable-11.0.0~557
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de663d0b5c4cbdd799932c7d6202326c8e2caf62;p=thirdparty%2Fopen-vm-tools.git

Drop suffix 64 in public except vm_basic_types

This change renames PPN64, TPPN64, PgNum64 and PgCnt64 as PPN, TPPN,
PageNum and PageCnt respectively in the public directory.
---

diff --git a/open-vm-tools/lib/include/vmci_defs.h b/open-vm-tools/lib/include/vmci_defs.h
index 8fcd8cd15..9ec3781f6 100644
--- a/open-vm-tools/lib/include/vmci_defs.h
+++ b/open-vm-tools/lib/include/vmci_defs.h
@@ -521,7 +521,7 @@ typedef struct VMCIQueueHeader {
 
 
 static INLINE PPN32
-VMCI_PPN64_TO_PPN32(PPN64 ppn)
+VMCI_PPN64_TO_PPN32(PPN ppn)
 {
    ASSERT(ppn <= MAX_UINT32);
    return (PPN32)ppn;
diff --git a/open-vm-tools/modules/shared/vmmemctl/balloon_def.h b/open-vm-tools/modules/shared/vmmemctl/balloon_def.h
index 95e0f6068..12a360d69 100644
--- a/open-vm-tools/modules/shared/vmmemctl/balloon_def.h
+++ b/open-vm-tools/modules/shared/vmmemctl/balloon_def.h
@@ -306,7 +306,7 @@ Balloon_BatchSetStatus(BalloonBatchPage *batchPage,      // IN
    PA64 pa = Balloon_BatchGetPA(batchPage, idx);
    ASSERT(idx < BALLOON_BATCH_MAX_ENTRIES);
    ASSERT(error <= BALLOON_ERROR_BUSY && error >= BALLOON_FAILURE);
-   batchPage->entries[idx] = pa | (PPN64)error;
+   batchPage->entries[idx] = pa | (PPN)error;
 }
 
 MY_ASSERTS(BALLOON_BATCH_SIZE,