mirror of https://github.com/bitcoin/bitcoin
Merge bitcoin/bitcoin#29181: build: remove systemtap variadic patch
pull/29186/head6047e25035
Revert "depends: systemtap: remove variadic params that trigger compiler warnings" (fanquake) Pull request description: We now use C++20. ACKs for top commit: 0xB10C: ACK6047e25035
. That patch isn't needed anymore. TheCharlatan: ACK6047e25035
Tree-SHA512: 3adac4078d4d8f9999a6a11c4d164d9afbb68feda0459a7a74316963a80f3fb84e49989b74d2ab0bfc17cae9cec3d4a10768f7cec872d6bfc5805d65d9e16e6b
commit
cb6d619931
@ -1,16 +0,0 @@
|
||||
Could be dropped after a migration to C++20.
|
||||
See: https://github.com/bitcoin/bitcoin/issues/26916.
|
||||
|
||||
diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h
|
||||
index 4075a5f..7c6138c 100644
|
||||
--- a/includes/sys/sdt.h
|
||||
+++ b/includes/sys/sdt.h
|
||||
@@ -276,7 +276,7 @@ __extension__ extern unsigned long long __sdt_unsp;
|
||||
_SDT_ASM_1(.purgem _SDT_TYPE_) \
|
||||
_SDT_ASM_1(.purgem _SDT_TYPE)
|
||||
|
||||
-#define _SDT_ASM_BODY(provider, name, pack_args, args, ...) \
|
||||
+#define _SDT_ASM_BODY(provider, name, pack_args, args) \
|
||||
_SDT_DEF_MACROS \
|
||||
_SDT_ASM_1(990: _SDT_NOP) \
|
||||
_SDT_ASM_3( .pushsection .note.stapsdt,_SDT_ASM_AUTOGROUP,"note") \
|
Loading…
Reference in new issue