From 7bbfd456d33b1ad821d424d941d1ff516b407ab3 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Thu, 8 Mar 2018 11:26:14 -0600
Subject: [PATCH] Fix compile errors on Ubuntu 18.04 Bionic Beaver

---
 CMakeLists.txt              | 1 +
 depends/jsoncpp/jsoncpp.cpp | 2 ++
 library/MiscUtils.cpp       | 1 +
 3 files changed, 4 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58be5dff1..d4bba06d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,6 +187,7 @@ IF(UNIX)
   # ensure compatibility with older CPUs
   # enable C++11 features
   add_definitions(-DLINUX_BUILD)
+  add_definitions(-D_GLIBCXX_USE_C99)
   SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -Wall -Wno-unused-variable")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -mtune=generic -std=c++0x")
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -mtune=generic")
diff --git a/depends/jsoncpp/jsoncpp.cpp b/depends/jsoncpp/jsoncpp.cpp
index eb38217ef..009d04e7a 100644
--- a/depends/jsoncpp/jsoncpp.cpp
+++ b/depends/jsoncpp/jsoncpp.cpp
@@ -3922,8 +3922,10 @@ Value& Path::make(Value& root) const {
 #define isfinite finite
 #else
 #include <cmath>
+#ifndef isfinite // fix isfinite on Ubuntu 18.04
 #define isfinite std::isfinite
 #endif
+#endif
 
 #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below
 #define snprintf _snprintf
diff --git a/library/MiscUtils.cpp b/library/MiscUtils.cpp
index e350cb9ec..91a860991 100644
--- a/library/MiscUtils.cpp
+++ b/library/MiscUtils.cpp
@@ -36,6 +36,7 @@ distribution.
 #include <ctype.h>
 #include <stdarg.h>
 #include <string.h>
+#include <cstdlib>
 
 #include <sstream>
 #include <map>