From: John Wolfe <jwolfe@vmware.com>
Date: Thu, 12 Aug 2021 19:46:04 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-12.0.0~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd78c6abbb4f376afea1db423acaf483c4f56f32;p=thirdparty%2Fopen-vm-tools.git

Common header file change not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/vm_basic_defs.h b/open-vm-tools/lib/include/vm_basic_defs.h
index 2ebccb33e..38c889729 100644
--- a/open-vm-tools/lib/include/vm_basic_defs.h
+++ b/open-vm-tools/lib/include/vm_basic_defs.h
@@ -181,12 +181,10 @@ Max(int a, int b)
 #if defined __APPLE__
 #include <machine/param.h>
 #undef MASK
-   #if defined VM_ARM_ANY
-      #include <mach/machine/vm_param.h>
-      #undef PAGE_SHIFT
-      #undef PAGE_SIZE
-      #undef PAGE_MASK
-   #endif
+#include <mach/machine/vm_param.h>
+#undef PAGE_SHIFT
+#undef PAGE_SIZE
+#undef PAGE_MASK
 #endif
 
 /*