open-vm-tools: fix build with gcc-15

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Martin Jansa 2025-04-26 13:56:22 +02:00 committed by Khem Raj
parent f7eeca8807
commit 9c6c2d06e8
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 27 additions and 0 deletions

View File

@ -0,0 +1,26 @@
From 2a79621f58bf1c4bc0166ccc044fcf343fb66b44 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 20 Nov 2024 10:40:03 +1100
Subject: [PATCH] Fix build when compiling with -std=c23
Fixes the build when using gcc 15
Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/751]
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
open-vm-tools/lib/lock/ul.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/open-vm-tools/lib/lock/ul.c b/open-vm-tools/lib/lock/ul.c
index d376a98af..fc9fdb714 100644
--- a/open-vm-tools/lib/lock/ul.c
+++ b/open-vm-tools/lib/lock/ul.c
@@ -29,7 +29,7 @@
static Bool mxInPanic = FALSE; // track when involved in a panic
static Bool mxUserCollectLockingTree = FALSE;
-Bool (*MXUserTryAcquireForceFail)() = NULL;
+Bool (*MXUserTryAcquireForceFail)(const char *) = NULL;
static MX_Rank (*MXUserMxCheckRank)(void) = NULL;
static void (*MXUserMxLockLister)(void) = NULL;

View File

@ -43,6 +43,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stabl
file://0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \
file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \
file://0014-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \
file://0001-Fix-build-when-compiling-with-std-c23.patch;patchdir=.. \
"
UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)"