From: Kruti Pendharkar <kp025370@broadcom.com>
Date: Fri, 21 Feb 2025 13:54:27 +0000 (-0800)
Subject: Fix function pointer definition mismatch
X-Git-Tag: stable-13.0.0~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19fec7a1301abf9c2275c8ef8a06252e7dc346ef;p=thirdparty%2Fopen-vm-tools.git

Fix function pointer definition mismatch

Caught with -std=c23 option which is the default for gcc-15

Pull request: https://github.com/vmware/open-vm-tools/pull/751
Addresses issue: https://github.com/vmware/open-vm-tools/issues/750
---

diff --git a/open-vm-tools/AUTHORS b/open-vm-tools/AUTHORS
index b871a0235..f8da85626 100644
--- a/open-vm-tools/AUTHORS
+++ b/open-vm-tools/AUTHORS
@@ -101,3 +101,5 @@ Joseph Allen    Updated NetworkManager calls in suspend/resume scripts
 Brennan Kinney  Revise settings for vmware-user.desktop
                 - https://github.com/vmware/open-vm-tools/pull/668
 
+Rudy Heitbaum   Fix build when compiling with -std=c23
+                - https://github.com/vmware/open-vm-tools/pull/751
diff --git a/open-vm-tools/lib/lock/ul.c b/open-vm-tools/lib/lock/ul.c
index d376a98af..87ffc8dc6 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 *name) = NULL;
 
 static MX_Rank (*MXUserMxCheckRank)(void) = NULL;
 static void (*MXUserMxLockLister)(void) = NULL;