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/newview/llmarketplacefunctions.cpp | |
| 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/newview/llmarketplacefunctions.cpp')
| -rw-r--r-- | indra/newview/llmarketplacefunctions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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" |