Do not add include/json/, include/jsconcpp/ directly into the include path, rather clients have to include like "json/reader.h". This is necessary as those directories contain a file features.h, which also under Linux is a system header. This will lead GCC to pick up the wrong features.h (the one from json).

indra/cmake/JsonCpp.cmake

@@ -22,5 +22,5 @@ else (USESYSTEMLIBS)
       set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a)
     endif ( )
   endif (WINDOWS)
-  set(JSONCPP_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json")
+  set(JSONCPP_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include/")
 endif (USESYSTEMLIBS)

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.

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 "llvfile.h"
 
 #include "message.h" // for getting the port

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"

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"
 
 

indra/newview/llwebprofile.cpp

@@ -42,11 +42,7 @@
 #include "llcorehttputil.h"
 
 // third-party
-#if LL_USESYSTEMLIBS
 #include "jsoncpp/reader.h" // JSON
-#else
-#include "reader.h" // JSON
-#endif
 
 /*
  * Workflow: