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-
This commit is contained in:
fanquake 2018-07-11 15:14:29 +08:00
parent fa6e841e89
commit 3828a79711
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
2 changed files with 3 additions and 3 deletions

View file

@ -15,7 +15,7 @@
#include <byteswap.h> #include <byteswap.h>
#endif #endif
#if defined(__APPLE__) #if defined(MAC_OSX)
#if !defined(bswap_16) #if !defined(bswap_16)
@ -61,6 +61,6 @@ inline uint64_t bswap_64(uint64_t x)
} }
#endif // HAVE_DECL_BSWAP64 == 0 #endif // HAVE_DECL_BSWAP64 == 0
#endif // defined(__APPLE__) #endif // defined(MAC_OSX)
#endif // BITCOIN_COMPAT_BYTESWAP_H #endif // BITCOIN_COMPAT_BYTESWAP_H

View file

@ -1021,7 +1021,7 @@ bool FileCommit(FILE *file)
LogPrintf("%s: fdatasync failed: %d\n", __func__, errno); LogPrintf("%s: fdatasync failed: %d\n", __func__, errno);
return false; return false;
} }
#elif defined(__APPLE__) && defined(F_FULLFSYNC) #elif defined(MAC_OSX) && defined(F_FULLFSYNC)
if (fcntl(fileno(file), F_FULLFSYNC, 0) == -1) { // Manpage says "value other than -1" is returned on success if (fcntl(fileno(file), F_FULLFSYNC, 0) == -1) { // Manpage says "value other than -1" is returned on success
LogPrintf("%s: fcntl F_FULLFSYNC failed: %d\n", __func__, errno); LogPrintf("%s: fcntl F_FULLFSYNC failed: %d\n", __func__, errno);
return false; return false;