summaryrefslogtreecommitdiff
path: root/indra/llmessage
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/llmessage
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/llmessage')
-rw-r--r--indra/llmessage/llcorehttputil.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llcorehttputil.cpp b/indra/llmessage/llcorehttputil.cpp
index 7031f1aa8c..c8c9280029 100644
--- a/indra/llmessage/llcorehttputil.cpp
+++ b/indra/llmessage/llcorehttputil.cpp
@@ -35,8 +35,8 @@
#include "llsd.h"
#include "llsdjson.h"
#include "llsdserialize.h"
-#include "reader.h" // JSON
-#include "writer.h" // JSON
+#include "json/reader.h" // JSON
+#include "json/writer.h" // JSON
#include "llfilesystem.h"
#include "message.h" // for getting the port