From 296b1efe7ae696dea115aa98231ca0eb94470474 Mon Sep 17 00:00:00 2001 From: Veselin Georiev Date: Thu, 7 Jul 2016 21:47:20 +0300 Subject: [PATCH] Rename ATOM enum value as it clashes with some Windows headers. --- libcpuid/intel_code_t.h | 2 +- libcpuid/recog_intel.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libcpuid/intel_code_t.h b/libcpuid/intel_code_t.h index f2b95f1..c50ec9c 100644 --- a/libcpuid/intel_code_t.h +++ b/libcpuid/intel_code_t.h @@ -59,7 +59,7 @@ CODE(MORE_THAN_QUADCORE), CODE(PENTIUM_D), - CODE(ATOM), + CODE(ATOM_UNKNOWN), CODE(ATOM_SILVERTHORNE), CODE(ATOM_DIAMONDVILLE), CODE(ATOM_PINEVIEW), diff --git a/libcpuid/recog_intel.c b/libcpuid/recog_intel.c index 10f1172..dff6a0b 100644 --- a/libcpuid/recog_intel.c +++ b/libcpuid/recog_intel.c @@ -169,7 +169,7 @@ const struct match_entry_t cpudb_intel[] = { { 6, 13, -1, -1, -1, 1, -1, -1, MOBILE_PENTIUM_M , 0, "Pentium M (Dothan)" }, { 6, 13, -1, -1, -1, 1, -1, -1, CELERON , 0, "Celeron M" }, - { 6, 12, -1, -1, -1, -1, -1, -1, ATOM , 0, "Unknown Atom" }, + { 6, 12, -1, -1, -1, -1, -1, -1, ATOM_UNKNOWN , 0, "Unknown Atom" }, { 6, 12, -1, -1, -1, -1, -1, -1, ATOM_DIAMONDVILLE , 0, "Atom (Diamondville)" }, { 6, 12, -1, -1, -1, -1, -1, -1, ATOM_SILVERTHORNE , 0, "Atom (Silverthorne)" }, { 6, 12, -1, -1, -1, -1, -1, -1, ATOM_CEDARVIEW , 0, "Atom (Cedarview)" }, @@ -615,7 +615,7 @@ static intel_code_t get_brand_code(struct cpu_id_t* data) { ATOM_SILVERTHORNE, "Atom(TM) CPU Z" }, { ATOM_PINEVIEW, "Atom(TM) CPU D" }, { ATOM_CEDARVIEW, "Atom(TM) CPU N####" }, - { ATOM, "Atom(TM) CPU" }, + { ATOM_UNKNOWN, "Atom(TM) CPU" }, }; if (strstr(bs, "Mobile")) {