Skip to content

Commit 0046f3d

Browse files
committed
Merge bitcoin/bitcoin#28693: build: Include config/bitcoin-config.h explicitly in util/trace.h
6bdff42 build: Include `config/bitcoin-config.h` explicitly in `util/trace.h` (Hennadii Stepanov) Pull request description: The `ENABLE_TRACING` macro is expected to be defined in the `config/bitcoin-config.h` header. Therefore, the current code is error-prone as it depends on whether the `config/bitcoin-config.h` header was included before or not. This bug was noticed while working on CMake [stuff](hebasto/bitcoin#37). ACKs for top commit: fanquake: ACK 6bdff42 Tree-SHA512: 22c4fdeb51628814050eb99a83db4268a4f3106207eeef918a07214bbc52f2b22490f6b05fcb96216f147afa4197c51102503738131e2583e750b6d195747a49
2 parents f4e96c2 + 6bdff42 commit 0046f3d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/util/trace.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
#ifndef BITCOIN_UTIL_TRACE_H
66
#define BITCOIN_UTIL_TRACE_H
77

8+
#if defined(HAVE_CONFIG_H)
9+
#include <config/bitcoin-config.h>
10+
#endif
11+
812
#ifdef ENABLE_TRACING
913

1014
#include <sys/sdt.h>

0 commit comments

Comments
 (0)