From 0c6e79a61d1c610c6352de50aaf99e0ccb0fb3f2 Mon Sep 17 00:00:00 2001
From: Nicky <sl.nicky.ml@googlemail.com>
Date: Mon, 16 Jan 2017 16:06:11 +0100
Subject: [PATCH] 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                | 2 +-
 indra/llcommon/llsdjson.h                | 2 +-
 indra/llmessage/llcorehttputil.cpp       | 4 ++--
 indra/newview/llmarketplacefunctions.cpp | 4 ++--
 indra/newview/lltranslate.cpp            | 2 +-
 indra/newview/llwebprofile.cpp           | 4 ----
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index f6ac626074..1ce95385d5 100644
--- a/indra/cmake/JsonCpp.cmake
+++ b/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)
diff --git a/indra/llcommon/llsdjson.h b/indra/llcommon/llsdjson.h
index 2be7112404..e56cf03b45 100644
--- a/indra/llcommon/llsdjson.h
+++ b/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.
diff --git a/indra/llmessage/llcorehttputil.cpp b/indra/llmessage/llcorehttputil.cpp
index 7dd8e35be1..51f8c1dc4a 100644
--- a/indra/llmessage/llcorehttputil.cpp
+++ b/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
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index 698ac0f0d7..86bf06d4a1 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"
diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
index 1936e24761..4199172ae7 100644
--- a/indra/newview/lltranslate.cpp
+++ b/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"
 
 
diff --git a/indra/newview/llwebprofile.cpp b/indra/newview/llwebprofile.cpp
index a6d5e408f3..e57eb10686 100644
--- a/indra/newview/llwebprofile.cpp
+++ b/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: