Skip to content

Commit 3d180d3

Browse files
committed
Merge bitcoin/bitcoin#34462: util: Drop *BSD headers in batchpriority.cpp
07af50f util: Drop *BSD headers in `batchpriority.cpp` (Hennadii Stepanov) Pull request description: Currently, there are issues with headers in `batchpriority.cpp`: 1. `SCHED_BATCH` is not defined on all supported *BSD platforms. 2. `pthread.h` is necessary on other platforms. This PR addresses both issues and fixes other includes. ACKs for top commit: maflcko: review ACK 07af50f 🤺 w0xlt: crACK bitcoin/bitcoin@07af50f Tree-SHA512: 388f627e9d9c8b80834ba562034cd6aa44ba37d9156e13cdd6cbcfa93b19fcbf3222228d671784ca363e06fda3c978778f62f4530c3eb4ae3ff96adf91c2d789
2 parents 1eed88a + 07af50f commit 3d180d3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/util/batchpriority.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5+
#include <util/batchpriority.h>
6+
57
#include <logging.h>
68
#include <util/syserror.h>
79

8-
#if (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__))
9-
#include <pthread.h>
10-
#include <pthread_np.h>
11-
#endif
10+
#include <string>
1211

1312
#ifndef WIN32
13+
#include <pthread.h>
1414
#include <sched.h>
1515
#endif
1616

0 commit comments

Comments
 (0)