From: Andreas Schneider Date: Fri, 12 Sep 2025 13:37:38 +0000 (+0200) Subject: ctdb: Fix redefinitoin of pmdaResult X-Git-Tag: samba-4.23.1~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3749bc3dda3b1c7941c881f5b5269ea4b8a2d348;p=thirdparty%2Fsamba.git ctdb: Fix redefinitoin of pmdaResult ../../ctdb/utils/pmda/pmda_ctdb.c:52:9: warning: 'pmdaResult' redefined 52 | #define pmdaResult pmResult | ^~~~~~~~~~ In file included from ../../ctdb/utils/pmda/pmda_ctdb.c:35: /usr/include/pcp/pmda.h:30:9: note: this is the location of the previous definition 30 | #define pmdaResult pmResult_v2 | ^~~~~~~~~~ BUG: https://bugzilla.samba.org/show_bug.cgi?id=15904 Signed-off-by: Andreas Schneider Reviewed-by: Alexander Bokovoy Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Sat Sep 13 08:12:42 UTC 2025 on atb-devel-224 (cherry picked from commit d4b448c305f674646001e293d8aa6ebc0ca6dc77) --- diff --git a/ctdb/utils/pmda/pmda_ctdb.c b/ctdb/utils/pmda/pmda_ctdb.c index 9845f26defb..5c09aca7b84 100644 --- a/ctdb/utils/pmda/pmda_ctdb.c +++ b/ctdb/utils/pmda/pmda_ctdb.c @@ -48,7 +48,7 @@ #define pmSetProgname(a) __pmSetProgname(a) #endif -#ifdef HAVE_STRUCT_PMRESULT +#if !defined(pmdaResult) && defined(HAVE_STRUCT_PMRESULT) #define pmdaResult pmResult #endif