Auto merge of #2820 - str4d:darwin-build-patches, r=str4d

[macOS] Darwin build patches Part of #2246.
2018-04-03 12:44:24 -07:00
parent 3055fd5508 b96f7d692d
commit 599c847818
18 changed files with 187 additions and 160 deletions
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -159,7 +159,7 @@ public:
    // Transaction hash
    uint256 hash;
    // Index into CTransaction.vjoinsplit
-    size_t js;
+    uint64_t js;
    // Index into JSDescription fields of length ZC_NUM_JS_OUTPUTS
    uint8_t n;