From 0cf59807fa364b11de65dc3f1e1c2d2bc7dd87a2 Mon Sep 17 00:00:00 2001
From: Rusty Wagner <rusty@vector35.com>
Date: Fri, 8 May 2020 05:26:56 -0400
Subject: Modifications for supporting jemalloc in the core

---
 json/json.h      | 2 +-
 json/jsoncpp.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'json')

diff --git a/json/json.h b/json/json.h
index 51a38e65..da91470a 100644
--- a/json/json.h
+++ b/json/json.h
@@ -308,7 +308,7 @@ typedef UInt64 LargestUInt;
   std::basic_istringstream<char, std::char_traits<char>,                       \
                            Json::SecureAllocator<char> >
 #define JSONCPP_ISTREAM std::istream
-#else
+#elif !defined(JSONCPP_STRING)
 #define JSONCPP_STRING std::string
 #define JSONCPP_OSTRINGSTREAM std::ostringstream
 #define JSONCPP_OSTREAM std::ostream
diff --git a/json/jsoncpp.cpp b/json/jsoncpp.cpp
index c2a949d3..4154200b 100644
--- a/json/jsoncpp.cpp
+++ b/json/jsoncpp.cpp
@@ -71,7 +71,9 @@ license you like.
 
 
 
-
+#ifdef BINARYNINJACORE_LIBRARY
+#include "binaryninjacore_global.h"
+#endif
 
 #include "json/json.h"
 
-- 
cgit v1.3.1