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 8063fc5ce6fe3d6de8235cf9bde20f3b022810be..e6bbacb5cd869ca6c1b689251c88f764cd7d2020 100644 (file)
--- 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