Merge branch 'duke' into danger

This commit is contained in:
Duke Leto
2020-07-22 09:34:40 -04:00

View File

@@ -49,7 +49,9 @@
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/thread.hpp> #include <boost/thread.hpp>
#if defined(__GLIBC__)
#include <malloc.h> #include <malloc.h>
#endif
using namespace std; using namespace std;
using namespace libzcash; using namespace libzcash;