From 2cc6bab2011ddecd107aa8775b9c0c0467a1e475 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@z.cash>
Date: Fri, 10 Feb 2017 00:28:29 +0000
Subject: [PATCH] Update UniValue includes in Zcash-specific code

---
 src/Makefile.gtest.include              | 4 ++--
 src/asyncrpcoperation.h                 | 2 +-
 src/gtest/json_test_vectors.h           | 2 +-
 src/gtest/test_rpc.cpp                  | 2 +-
 src/rpcprotocol.cpp                     | 2 +-
 src/wallet/asyncrpcoperation_sendmany.h | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.gtest.include b/src/Makefile.gtest.include
index d608bfcc1..8db5aea41 100644
--- a/src/Makefile.gtest.include
+++ b/src/Makefile.gtest.include
@@ -40,9 +40,9 @@ zcash_gtest_SOURCES += \
 	wallet/gtest/test_wallet.cpp
 endif
 
-zcash_gtest_CPPFLAGS = -DMULTICORE -fopenmp -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC
+zcash_gtest_CPPFLAGS = -DMULTICORE -fopenmp -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC $(BITCOIN_INCLUDES)
 
-zcash_gtest_LDADD = -lgtest -lgmock $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
+zcash_gtest_LDADD = -lgtest -lgmock $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
   $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1)
 if ENABLE_ZMQ
 zcash_gtest_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
diff --git a/src/asyncrpcoperation.h b/src/asyncrpcoperation.h
index e095e57b1..5475102a5 100644
--- a/src/asyncrpcoperation.h
+++ b/src/asyncrpcoperation.h
@@ -15,7 +15,7 @@
 #include <utility>
 #include <future>
 
-#include "univalue/univalue.h"
+#include <univalue.h>
 
 using namespace std;
 
diff --git a/src/gtest/json_test_vectors.h b/src/gtest/json_test_vectors.h
index 27c8757ec..3639c9121 100644
--- a/src/gtest/json_test_vectors.h
+++ b/src/gtest/json_test_vectors.h
@@ -5,7 +5,7 @@
 #include "serialize.h"
 #include "streams.h"
 
-#include "univalue/univalue.h"
+#include <univalue.h>
 
 UniValue
 read_json(const std::string& jsondata);
diff --git a/src/gtest/test_rpc.cpp b/src/gtest/test_rpc.cpp
index baebc7c65..a3fc201cd 100644
--- a/src/gtest/test_rpc.cpp
+++ b/src/gtest/test_rpc.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "univalue/univalue.h"
+#include <univalue.h>
 
 #include "chain.h"
 #include "chainparams.h"
diff --git a/src/rpcprotocol.cpp b/src/rpcprotocol.cpp
index c0aaf2c29..684feb823 100644
--- a/src/rpcprotocol.cpp
+++ b/src/rpcprotocol.cpp
@@ -26,7 +26,7 @@
 #include <boost/iostreams/stream.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "univalue/univalue.h"
+#include <univalue.h>
 
 using namespace std;
 
diff --git a/src/wallet/asyncrpcoperation_sendmany.h b/src/wallet/asyncrpcoperation_sendmany.h
index e870e6039..6fac61160 100644
--- a/src/wallet/asyncrpcoperation_sendmany.h
+++ b/src/wallet/asyncrpcoperation_sendmany.h
@@ -16,7 +16,7 @@
 #include <unordered_map>
 #include <tuple>
 
-#include "univalue/univalue.h"
+#include <univalue.h>
 
 // Default transaction fee if caller does not specify one.
 #define ASYNC_RPC_OPERATION_DEFAULT_MINERS_FEE   10000