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

diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h
index 68067eaeeaeb82718909bf783364bd6865923d02..0d779079c69d902a83d36fd76e850be242584d8f 100644 (file)
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -1513,7 +1513,7 @@ CPUID_IsVendorVIA(CPUIDRegs *id0)
 }
 
 static INLINE Bool
-CPUID_IsVendorHigon(CPUIDRegs *id0)
+CPUID_IsVendorHygon(CPUIDRegs *id0)
 {
    return CPUID_IsRawVendor(id0, CPUID_HIGON_VENDOR_STRING);
 }

diff --git a/open-vm-tools/lib/include/x86vendor.h b/open-vm-tools/lib/include/x86vendor.h
index d6cea5db49a3e285437d730b7f55fbcb2e5ab0ac..8b5e9f635878d06b5963174f7bf2a9ccc163d43b 100644 (file)
--- a/open-vm-tools/lib/include/x86vendor.h
+++ b/open-vm-tools/lib/include/x86vendor.h
@@ -45,8 +45,11 @@ typedef enum {
    CPUID_VENDOR_AMD,
    CPUID_VENDOR_CYRIX,
    CPUID_VENDOR_VIA,
-   CPUID_VENDOR_HIGON,
+   CPUID_VENDOR_HYGON,
    CPUID_NUM_VENDORS
 } CpuidVendor;
 
+//XXX Temporary until rename is complete
+#define CPUID_VENDOR_HIGON CPUID_VENDOR_HYGON
+
 #endif