From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:03 +0000 (-0700)
Subject: Change to shared header file unrelated to open-vm-tools
X-Git-Tag: stable-10.2.0~535
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aeff7f0b8d14d5a23fe4037e6dccc4de8c189295;p=thirdparty%2Fopen-vm-tools.git

Change to shared header file unrelated to open-vm-tools
---

diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h
index 8063fc5ce..e6bbacb5c 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -73,7 +73,10 @@ typedef union CPUIDRegsUnion {
  * Results of calling cpuid(eax, ecx) on all host logical CPU.
  */
 #ifdef _MSC_VER
+// TODO: Move this under the push
 #pragma warning (disable :4200) // non-std extension: zero-sized array in struct
+#pragma warning (push)
+#pragma warning (disable :4100) // unreferenced parameters
 #endif
 
 typedef
@@ -2039,4 +2042,8 @@ CPUID_SupportsMsrPlatformInfo(CpuidVendor vendor, uint32 version)
            CPUID_MODEL_IS_AVOTON(version));
 }
 
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif
+
 #endif