From c611e880b3ca8fb210a5294592922d2a031e1cb5 Mon Sep 17 00:00:00 2001 From: The Tumultuous Unicorn Of Darkness Date: Fri, 25 Apr 2025 21:28:43 +0200 Subject: [PATCH] Add a workaround to build on Windows --- libcpuid/libcpuid_internal.h | 4 ++-- libcpuid/recog_centaur.c | 6 +++--- libcpuid/recog_intel.c | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libcpuid/libcpuid_internal.h b/libcpuid/libcpuid_internal.h index 789c4c1..70d8248 100644 --- a/libcpuid/libcpuid_internal.h +++ b/libcpuid/libcpuid_internal.h @@ -122,7 +122,7 @@ struct internal_type_info_array_t { struct internal_type_info_t* data; }; -#define LBIT(x) (((uint64_t) 1) << x) +#define LBIT(x) ((1ULL) << x) // common detection bits for CPUs: #define _M_ LBIT( 0 ) @@ -204,7 +204,7 @@ struct internal_type_info_array_t { #define _KH_ LBIT( (LAST_COMMON_BIT + 3) ) #define _KX_ LBIT( (LAST_COMMON_BIT + 4) ) #define _ZX_ LBIT( (LAST_COMMON_BIT + 5) ) -#define _C LBIT( (LAST_COMMON_BIT + 6) ) +#define __C LBIT( (LAST_COMMON_BIT + 6) ) #define _D LBIT( (LAST_COMMON_BIT + 7) ) diff --git a/libcpuid/recog_centaur.c b/libcpuid/recog_centaur.c index 423c3b5..10f14cf 100644 --- a/libcpuid/recog_centaur.c +++ b/libcpuid/recog_centaur.c @@ -90,8 +90,8 @@ const struct match_entry_t cpudb_centaur[] = { // F M S EF EM #cores L2$ L3$ BC ModelBits ModelCode Name { 7, -1, -1, -1, -1, -1, -1, -1, ZHAOXIN, 0 , 0, "Unknown Zhaoxin CPU" }, /* Zhangjiang (2015, 28 nm) */ - { 7, -1, -1, -1, 15, -1, -1, -1, ZHAOXIN, KAISHENG_|_KH_|_C, 0, "Zhaoxin KaisHeng (ZhangJiang)" }, // C+ (4000) - { 7, -1, -1, -1, 15, -1, -1, -1, ZHAOXIN, KAIXIAN_|_ZX_|_C , 0, "Zhaoxin KaiXian (ZhangJiang)" }, // C/C+ (4000) + { 7, -1, -1, -1, 15, -1, -1, -1, ZHAOXIN, KAISHENG_|_KH_|__C, 0, "Zhaoxin KaisHeng (ZhangJiang)" }, // C+ (4000) + { 7, -1, -1, -1, 15, -1, -1, -1, ZHAOXIN, KAIXIAN_|_ZX_|__C , 0, "Zhaoxin KaiXian (ZhangJiang)" }, // C/C+ (4000) /* WuDaoKou (2017, 28 nm) */ { 7, -1, -1, -1, 27, -1, -1, -1, ZHAOXIN, KAISHENG_|_KH_ , _20000, "Zhaoxin KaisHeng (WuDaoKou)" }, // KH (20000) { 7, -1, -1, -1, 27, -1, -1, -1, ZHAOXIN, KAIXIAN_|_KX_ , _5000, "Zhaoxin KaiXian (WuDaoKou)" }, // KX (5000) @@ -133,7 +133,7 @@ static centaur_code_and_bits_t get_brand_code_and_bits(struct cpu_id_t* data) { _KH_, "KH" }, { _KX_, "KX" }, { _ZX_, "ZX" }, - { _C, "-C" }, + { __C, "-C" }, { _D, "-D" }, { _E, "-E" }, }; diff --git a/libcpuid/recog_intel.c b/libcpuid/recog_intel.c index 6d75fca..1e7e3d9 100644 --- a/libcpuid/recog_intel.c +++ b/libcpuid/recog_intel.c @@ -783,8 +783,7 @@ static intel_code_and_bits_t get_brand_code_and_bits(struct cpu_id_t* data) const size_t n = strlen(bs); const struct { intel_code_t c; const char *search; } matchtable[] = { { PENTIUM_M, "Pentium(R) M" }, - { CORE_SOLO, "Pentium(R) Dual CPU" }, - { CORE_SOLO, "Pentium(R) Dual-Core" }, + { CORE_SOLO, "Pentium(R) Dual" }, { PENTIUM_D, "Pentium(R) D" }, { CORE_SOLO, "Genuine Intel(R) CPU" }, { CORE_SOLO, "Intel(R) Core(TM)" },