From f955e9c88a8182055bc2a3a047e44faa22e4edb3 Mon Sep 17 00:00:00 2001 From: Nicky Date: Fri, 6 Apr 2018 12:44:37 +0200 Subject: [PATCH] More of that json/ include path madness. --- indra/llmessage/llcorehttputil.cpp | 7 +++++++ indra/newview/llmarketplacefunctions.cpp | 7 +++++++ indra/newview/lltranslate.cpp | 6 ++++++ 3 files changed, 20 insertions(+) diff --git a/indra/llmessage/llcorehttputil.cpp b/indra/llmessage/llcorehttputil.cpp index 24387fbffd..26c98b7bae 100644 --- a/indra/llmessage/llcorehttputil.cpp +++ b/indra/llmessage/llcorehttputil.cpp @@ -35,8 +35,15 @@ #include "llsd.h" #include "llsdjson.h" #include "llsdserialize.h" + +#ifndef LL_USESYSTEMLIBS #include "reader.h" // JSON #include "writer.h" // JSON +#else +#include "json/reader.h" // JSON +#include "json/writer.h" // JSON +#endif + #include "llvfile.h" #include "message.h" // for getting the port diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index a0e19f2d19..816e91cdc6 100644 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -41,8 +41,15 @@ #include "llviewermedia.h" #include "llviewernetwork.h" #include "llviewerregion.h" + +#ifndef LL_USESYSTEMLIBS #include "reader.h" // JSON #include "writer.h" // JSON +#else +#include "json/reader.h" // JSON +#include "json/writer.h" // JSON +#endif + #include "lleventcoro.h" #include "llcoros.h" #include "llcorehttputil.h" diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp index 1936e24761..7f42d79e41 100644 --- a/indra/newview/lltranslate.cpp +++ b/indra/newview/lltranslate.cpp @@ -36,7 +36,13 @@ #include "llversioninfo.h" #include "llviewercontrol.h" #include "llcoros.h" + +#ifndef LL_USESYSTEMLIBS #include "reader.h" +#else +#include "json/reader.h" +#endif + #include "llcorehttputil.h"