diff --git a/src/netbase.cpp b/src/netbase.cpp index 54d2bef7c..b46fd11e3 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -16,6 +16,12 @@ #include "util.h" #include "utilstrencodings.h" +#ifdef __APPLE__ +#ifdef HAVE_GETADDRINFO_A +#undef HAVE_GETADDRINFO_A +#endif +#endif + #ifdef HAVE_GETADDRINFO_A #include #endif diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp index 399cd665a..6c3769b01 100644 --- a/src/primitives/transaction.cpp +++ b/src/primitives/transaction.cpp @@ -47,8 +47,13 @@ JSDescription JSDescription::Randomized( const uint256& anchor, boost::array& inputs, boost::array& outputs, +#ifdef __APPLE__ + boost::array& inputMap, + boost::array& outputMap, +#else boost::array& inputMap, boost::array& outputMap, +#endif CAmount vpub_old, CAmount vpub_new, bool computeProof, diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index 9a0e78ef4..65e7a5896 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -86,8 +86,13 @@ public: const uint256& rt, boost::array& inputs, boost::array& outputs, +#ifdef __APPLE__ + boost::array& inputMap, + boost::array& outputMap, +#else boost::array& inputMap, boost::array& outputMap, +#endif CAmount vpub_old, CAmount vpub_new, bool computeProof = true, // Set to false in some tests diff --git a/src/wallet/asyncrpcoperation_sendmany.cpp b/src/wallet/asyncrpcoperation_sendmany.cpp index f72badc60..a203c4a21 100644 --- a/src/wallet/asyncrpcoperation_sendmany.cpp +++ b/src/wallet/asyncrpcoperation_sendmany.cpp @@ -873,8 +873,13 @@ Object AsyncRPCOperation_sendmany::perform_joinsplit( {info.vjsin[0], info.vjsin[1]}; boost::array outputs {info.vjsout[0], info.vjsout[1]}; +#ifdef __APPLE__ + boost::array inputMap; + boost::array outputMap; +#else boost::array inputMap; boost::array outputMap; +#endif JSDescription jsdesc = JSDescription::Randomized( *pzcashParams, joinSplitPubKey_, diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index c75f1f54d..404edf4b7 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -160,7 +160,11 @@ public: // Transaction hash uint256 hash; // Index into CTransaction.vjoinsplit +#ifdef __APPLE__ + uint64_t js; +#else size_t js; +#endif // Index into JSDescription fields of length ZC_NUM_JS_OUTPUTS uint8_t n;