From fb830e99fdd811fea12f684f4c4339450a9607c9 Mon Sep 17 00:00:00 2001 From: Otto Kekalainen Date: Thu, 4 Jul 2024 00:03:58 -0700 Subject: [PATCH] Make compile_time_assert compatible with x32 (Closes: #1063738) The x32 build was failing on: compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656); Reported upstream at https://jira.mariadb.org/browse/MDEV-34195. This is a regression from upstream commits c432c9ef and 06a884a57071. Fix is based on advice from https://lists.debian.org/debian-amd64/2024/07/msg00003.html which is also aligned with https://wiki.debian.org/X32Port. Forwarded: no Gbp-Pq: Name 1063738-x32-compile-time-assert.patch --- tests/mysql_client_fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c index 1c71ac884..e192287d5 100644 --- a/tests/mysql_client_fw.c +++ b/tests/mysql_client_fw.c @@ -1444,7 +1444,7 @@ int main(int argc, char **argv) */ #if defined _M_AMD64 compile_time_assert(sizeof(MYSQL) == 1208); -#elif defined __x86_64__ +#elif defined(__x86_64__) && !defined(__ILP32__) compile_time_assert(sizeof(MYSQL) == 1272); #elif defined __i386__ compile_time_assert(sizeof(MYSQL) == 964); -- 2.30.2