diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-07-18 13:52:07 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-07-18 13:52:07 +0800 |
| commit | c6048b2a8e18877f3f8bd0a7e190c553a3caa9a5 (patch) | |
| tree | 5e5b921f08012b20a5ae940d4f8ac4bd95e2f444 /indra/llcommon/llsdjson.cpp | |
| parent | 04081678eeaa1d56cecc1c68aa358d255addf81d (diff) | |
| parent | 09a3bac9436af1b6077fb27885c8c6c645f40a8e (diff) | |
Merge branch 'main' into 2025.05
Diffstat (limited to 'indra/llcommon/llsdjson.cpp')
| -rw-r--r-- | indra/llcommon/llsdjson.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/llsdjson.cpp b/indra/llcommon/llsdjson.cpp index 655869a704..a4b45ed80d 100644 --- a/indra/llcommon/llsdjson.cpp +++ b/indra/llcommon/llsdjson.cpp @@ -35,7 +35,11 @@ #include "llerror.h" #include "../llmath/llmath.h" +#if LL_WINDOWS +#include <boost/json.hpp> +#else #include <boost/json/src.hpp> +#endif //========================================================================= LLSD LlsdFromJson(const boost::json::value& val) |