diff options
| author | Nicky <nicky.dasmijn@gmail.com> | 2022-04-18 02:50:43 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@gmail.com> | 2022-04-18 02:50:43 +0200 |
| commit | 1966d837e196f1ef043ee46666a9f661d6f54db1 (patch) | |
| tree | 13395caafa80cde07b2f272c342bcca96b403502 /indra | |
| parent | 363f2df4fa22b3eb95ff4603d73b7a042f3fefd1 (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')
| -rw-r--r-- | indra/cmake/JsonCpp.cmake | 2 | ||||
| -rw-r--r-- | indra/llcommon/llsdjson.h | 2 | ||||
| -rw-r--r-- | indra/llmessage/llcorehttputil.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llmarketplacefunctions.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/lltranslate.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llwebprofile.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 0b6a82e576..e7f7c13134 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -12,4 +12,4 @@ elseif (DARWIN) elseif (LINUX) target_link_libraries( ll::jsoncpp INTERFACE libjson_linux-gcc-4.1.3_libmt.a ) endif (WINDOWS) -target_include_directories( ll::jsoncpp SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/json) +target_include_directories( ll::jsoncpp SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include) 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. 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 diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index 044c76ce2c..c470cb17af 100644 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -41,8 +41,8 @@ #include "llviewermedia.h" #include "llviewernetwork.h" #include "llviewerregion.h" -#include "reader.h" // JSON -#include "writer.h" // JSON +#include "json/reader.h" // JSON +#include "json/writer.h" // JSON #include "lleventcoro.h" #include "llcoros.h" #include "llcorehttputil.h" diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp index a2c696c762..4b9f322dfa 100644 --- a/indra/newview/lltranslate.cpp +++ b/indra/newview/lltranslate.cpp @@ -36,7 +36,7 @@ #include "llversioninfo.h" #include "llviewercontrol.h" #include "llcoros.h" -#include "reader.h" +#include "json/reader.h" #include "llcorehttputil.h" #include "llurlregistry.h" diff --git a/indra/newview/llwebprofile.cpp b/indra/newview/llwebprofile.cpp index ff899fe895..0d553657d8 100644 --- a/indra/newview/llwebprofile.cpp +++ b/indra/newview/llwebprofile.cpp @@ -42,7 +42,7 @@ #include "llcorehttputil.h" // third-party -#include "reader.h" // JSON +#include "json/reader.h" // JSON /* * Workflow: |