summaryrefslogtreecommitdiff
path: root/src/serverlist.cpp
diff options
context:
space:
mode:
authorRogier-5 <Rogier-5@users.noreply.github.com>2016-08-10 12:10:00 +0200
committerest31 <est31@users.noreply.github.com>2016-08-10 12:10:00 +0200
commit4503b5097f99d2806763650f33d8ef3b49f77ce4 (patch)
treed682a8b3ac13c79ece798ae05b9546ecfa770382 /src/serverlist.cpp
parent058a869b70072aba8baea47e359c45e82daaf152 (diff)
downloadminetest-4503b5097f99d2806763650f33d8ef3b49f77ce4.tar.gz
minetest-4503b5097f99d2806763650f33d8ef3b49f77ce4.tar.bz2
minetest-4503b5097f99d2806763650f33d8ef3b49f77ce4.zip
Fixes for compiling with a newer (system) jsoncpp (#4429)
* Move included json code to jsoncpp subdirectory This is needed to avoid having to specify the minetest src directory as a system include when fixing the json includes. * Fix json includes They used "", so that the compiler searches the project's directory first. The result was that when compiling with a system jsoncpp, the project's own version of json.h was still included, instead of the system version. The includes now use <>, so a system location, or one specified with '-Ilocation' is searched only. * Fix for jsoncpp deprecated function warning When compiling with a newer version of jsoncpp (and ENABLE_SYSTEM_JSONCPP=true), jsoncpp emits a warning about a deprecated function that minetest uses.
Diffstat (limited to 'src/serverlist.cpp')
-rw-r--r--src/serverlist.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index de7962a68..87ca5dc04 100644
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "porting.h"
#include "log.h"
#include "network/networkprotocol.h"
-#include "json/json.h"
+#include <json/json.h>
#include "convert_json.h"
#include "httpfetch.h"
#include "util/string.h"