The branch, master has been updated
via d4b448c305f ctdb: Fix redefinitoin of pmdaResult
from beaf661b1ec winbind: Initialize idmap in winbindd_getgroups
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d4b448c305f674646001e293d8aa6ebc0ca6dc77
Author: Andreas Schneider <[email protected]>
Date: Fri Sep 12 15:37:38 2025 +0200
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 <[email protected]>
Reviewed-by: Alexander Bokovoy <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Sat Sep 13 08:12:42 UTC 2025 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
ctdb/utils/pmda/pmda_ctdb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
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
--
Samba Shared Repository
