Skip to content

Commit 3828a79

Browse files
committed
scripted-diff: prefer MAC_OSX over __APPLE__
-BEGIN VERIFY SCRIPT- sed -i 's/__APPLE__/MAC_OSX/g' src/compat/byteswap.h src/util.cpp -END VERIFY SCRIPT-
1 parent fa6e841 commit 3828a79

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/compat/byteswap.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <byteswap.h>
1616
#endif
1717

18-
#if defined(__APPLE__)
18+
#if defined(MAC_OSX)
1919

2020
#if !defined(bswap_16)
2121

@@ -61,6 +61,6 @@ inline uint64_t bswap_64(uint64_t x)
6161
}
6262
#endif // HAVE_DECL_BSWAP64 == 0
6363

64-
#endif // defined(__APPLE__)
64+
#endif // defined(MAC_OSX)
6565

6666
#endif // BITCOIN_COMPAT_BYTESWAP_H

src/util.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,7 @@ bool FileCommit(FILE *file)
10211021
LogPrintf("%s: fdatasync failed: %d\n", __func__, errno);
10221022
return false;
10231023
}
1024-
#elif defined(__APPLE__) && defined(F_FULLFSYNC)
1024+
#elif defined(MAC_OSX) && defined(F_FULLFSYNC)
10251025
if (fcntl(fileno(file), F_FULLFSYNC, 0) == -1) { // Manpage says "value other than -1" is returned on success
10261026
LogPrintf("%s: fcntl F_FULLFSYNC failed: %d\n", __func__, errno);
10271027
return false;

0 commit comments

Comments
 (0)