Attachment 18726 Details for Bug 15904 – additional patch for 4.23

[patch] additional patch for 4.23

0001-ctdb-Fix-redefinitoin-of-pmdaResult.patch (text/plain), 1.35 KB, created by Andreas Schneider on 2025-09-15 06:20:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2025-09-15 06:20:39 UTC

Size: 1.35 KB

patch

obsolete

>From 9ce54959d580228de7fd6c290a725db512e5f8b2 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Fri, 12 Sep 2025 15:37:38 +0200
>Subject: [PATCH] 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 <asn@samba.org>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>
>Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
>Autobuild-Date(master): Sat Sep 13 08:12:42 UTC 2025 on atb-devel-224
>
>(cherry picked from commit d4b448c305f674646001e293d8aa6ebc0ca6dc77)
>---
> ctdb/utils/pmda/pmda_ctdb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>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
> 
>-- 
>2.51.0
>

Flags:

ab: review+

Actions: View

Attachments on bug 15904: 18702 | 18709 | 18726