Skip to content

Commit 6348bc6

Browse files
committed
Merge bitcoin/bitcoin#24746: refactor: remove macOS MAP_ANONYMOUS work around
112a7ab refactor: remove macOS MAP_ANONYMOUS work around (fanquake) Pull request description: This was added to support compilation on macOS 10.10, our minimum required macOS is now 10.15. macOS has also supported it since 10.11. See bitcoin/bitcoin#9063. macOS 12.3 manpage for mmap: ```bash MAP_ANONYMOUS Synonym for MAP_ANON. MAP_ANON Map anonymous memory not associated with any specific file. ``` ACKs for top commit: laanwj: Code review ACK 112a7ab jarolrod: ACK 112a7ab Tree-SHA512: 920744c755d05d813ab312ff27e42eacb27b1297972800e6fb64bbaad1ea14258751a7dd80c07bfa554a172f36960b26a07505f67e82885253c8bf551073c38e
2 parents 67dc002 + 112a7ab commit 6348bc6

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

src/support/lockedpool.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,12 +235,6 @@ PosixLockedPageAllocator::PosixLockedPageAllocator()
235235
#endif
236236
}
237237

238-
// Some systems (at least OS X) do not define MAP_ANONYMOUS yet and define
239-
// MAP_ANON which is deprecated
240-
#ifndef MAP_ANONYMOUS
241-
#define MAP_ANONYMOUS MAP_ANON
242-
#endif
243-
244238
void *PosixLockedPageAllocator::AllocateLocked(size_t len, bool *lockingSuccess)
245239
{
246240
void *addr;

0 commit comments

Comments
 (0)