summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorNicky <nicky.dasmijn@gmail.com>2022-04-18 02:50:43 +0200
committerNicky <nicky.dasmijn@gmail.com>2022-04-18 02:50:43 +0200
commit1966d837e196f1ef043ee46666a9f661d6f54db1 (patch)
tree13395caafa80cde07b2f272c342bcca96b403502 /indra/llcommon
parent363f2df4fa22b3eb95ff4603d73b7a042f3fefd1 (diff)
jsoncpp includepath should not include json/. jsoncpp includes a header "features.h"
which has the same name as a glibc header, allowing this header to be found without any prefix will lead to head conflicts when there is a '#include "features.h"' As a result all json headers need to be included via #include "json/reader.h"/"json/writer.h"
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llsdjson.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsdjson.h b/indra/llcommon/llsdjson.h
index 2be7112404..e56cf03b45 100644
--- a/indra/llcommon/llsdjson.h
+++ b/indra/llcommon/llsdjson.h
@@ -34,7 +34,7 @@
#include "stdtypes.h"
#include "llsd.h"
-#include "value.h"
+#include "json/value.h"
/// Convert a parsed JSON structure into LLSD maintaining member names and
/// array indexes.