Skip to content

Commit 0b4218e

Browse files
committed
Merge bitcoin/bitcoin#29834: build: Change MAC_OSX macro to __APPLE__ in crypto
a71eadf Change MAC_OSX macro to __APPLE__ in crypto package (Lőrinc) Pull request description: Split out from bitcoin/bitcoin#29450 (comment) to avoid the uncertainties and simplify review. ACKs for top commit: theuni: ACK a71eadf fanquake: ACK a71eadf Tree-SHA512: b6a7bd7ca95585dd9110cefe7c1213f4a1a72bdfc88670abf4a0d9a8bbc12e093544524adce46aa9ca714c472d417f74ca4a678af682ed2488053059434eaa02
2 parents bf031a5 + a71eadf commit 0b4218e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/crypto/sha256.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <asm/hwcap.h>
2121
#endif
2222

23-
#if defined(MAC_OSX) && defined(ENABLE_ARM_SHANI)
23+
#if defined(__APPLE__) && defined(ENABLE_ARM_SHANI)
2424
#include <sys/types.h>
2525
#include <sys/sysctl.h>
2626
#endif
@@ -670,7 +670,7 @@ std::string SHA256AutoDetect(sha256_implementation::UseImplementation use_implem
670670
#endif
671671
#endif
672672

673-
#if defined(MAC_OSX)
673+
#if defined(__APPLE__)
674674
int val = 0;
675675
size_t len = sizeof(val);
676676
if (sysctlbyname("hw.optional.arm.FEAT_SHA256", &val, &len, nullptr, 0) == 0) {

0 commit comments

Comments
 (0)