Commit 893ccea
committed
Merge bitcoin/bitcoin#31419: test: fix MIN macro redefinition
00c1dbd test: fix MIN macro-redefinition (0xb10c)
Pull request description:
Renames the `MIN` macro to `_TRACEPOINT_TEST_MIN`.
From #31418:
```
stderr:
/virtual/main.c:70:9: warning: 'MIN' macro redefined [-Wmacro-redefined]
70 | #define MIN(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a < _b ? _a : _b; })
| ^
include/linux/minmax.h:329:9: note: previous definition is here
329 | #define MIN(a,b) __cmp(min,a,b)
| ^
1 warning generated.
```
fixes: bitcoin/bitcoin#31418
ACKs for top commit:
maflcko:
review ACK 00c1dbd
Tree-SHA512: 1d91ed8b3c0b0410d42a11004286359546c17613c3ff03dd51c26896ee050e9280fff69fa2eaa6e6085f9b611663bcacedec80997a6c5e37874a79ba86bfa5071 file changed
+4
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | | - | |
| 43 | + | |
| 44 | + | |
44 | 45 | | |
45 | 46 | | |
46 | 47 | | |
| |||
60 | 61 | | |
61 | 62 | | |
62 | 63 | | |
63 | | - | |
| 64 | + | |
64 | 65 | | |
65 | 66 | | |
66 | 67 | | |
| |||
73 | 74 | | |
74 | 75 | | |
75 | 76 | | |
76 | | - | |
| 77 | + | |
77 | 78 | | |
78 | 79 | | |
79 | 80 | | |
| |||
0 commit comments