If building standlone do not blindly add ../json to the include search path. IMO that's horrible as generic includes like value.h/write.h/config.h/features.h should not be reachable with just #include <config.h>. This will easily clash with system includes. IMO normal builds should use #include "json/<header.h>" too.

2018-04-06 12:37:21 +02:00 · 2018-04-06 12:37:21 +02:00 · 1531775be7
parent 4af80ab7cb
commit 1531775be7
1 changed files with 5 additions and 0 deletions
--- a/indra/llcommon/llsdjson.h
+++ b/indra/llcommon/llsdjson.h
@ -34,7 +34,12 @@
 #include "stdtypes.h"

 #include "llsd.h"
+
+#ifndef LL_USESYSTEMLIBS
 #include "value.h"
+#else
+#include "json/value.h"
+#endif

 /// Convert a parsed JSON structure into LLSD maintaining member names and 
 /// array indexes.