From 53ea2b7ad050ce4ad95c89bb55197209b65886a1 Mon Sep 17 00:00:00 2001 From: David Rowley Date: Thu, 8 Jun 2023 10:10:34 +1200 Subject: [PATCH] Don't use _BitScanForward64/_BitScanReverse64 on 32-bit MSVC builds 677319746 added support for making use of MSVC's bit scanning functions. However, that commit failed to consider 32-bit MSVC builds where the 64-bit versions of these functions are unavailable. This resulted in compilation failures on 32-bit MSVC. Here we adjust the code so we fall back on the manual way of finding the bit positions for 64-bit integers when building on 32-bit MSVC. Bug: #17967 Reported-by: Youmiu Mo Discussion: https://postgr.es/m/17967-cd21e34a314141b2@postgresql.org --- src/include/port/pg_bitutils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/include/port/pg_bitutils.h b/src/include/port/pg_bitutils.h index 158ef73a2b..21a4fa0341 100644 --- a/src/include/port/pg_bitutils.h +++ b/src/include/port/pg_bitutils.h @@ -81,7 +81,7 @@ pg_leftmost_one_pos64(uint64 word) #error must have a working 64-bit integer datatype #endif /* HAVE_LONG_INT_64 */ -#elif defined(_MSC_VER) +#elif defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_ARM64)) unsigned long result; bool non_zero; @@ -152,7 +152,7 @@ pg_rightmost_one_pos64(uint64 word) #error must have a working 64-bit integer datatype #endif /* HAVE_LONG_INT_64 */ -#elif defined(_MSC_VER) +#elif defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_ARM64)) unsigned long result; bool non_zero;