Have unencapsulated Expat headers in any condition

The only condition where Expat headers would be encapsulated is when
using LL's Autobuild-based prebuilt libraries, and we're never using
any of LL's prebuilt binary for Expat on desktop, since Expat is
practically available on any supported desktop platform.
The system Expat headers are never encapsulated in any of those
platforms.
This is the beginning of not relying on the LL_USESYSTEMLIBS macro
any more (eventually not relying on the custom USESYSTEMLIBS CMake
setting either).
Keeping the build system still flexible to have the option to use
LL's prebuilt libraries *fully* (we still use some of them in cases
where the platform may not have the related system library or for
convenience, so the term USESYSTEMLIBS may not always be consistent),
is getting harder to maintain.
The way it's done is using #if 1, in order to minimise difference
from upstream.

8 files changed, 8 insertions, 8 deletions

diff --git a/indra/llcommon/llsdserialize_xml.cpp b/indra/llcommon/llsdserialize_xml.cpp
index 6396caf8d5..ce416baa04 100644
--- a/indra/llcommon/llsdserialize_xml.cpp
+++ b/indra/llcommon/llsdserialize_xml.cpp
@@ -35,7 +35,7 @@
 
 extern "C"
 {
-#ifdef LL_USESYSTEMLIBS
+#if 1
 # include <expat.h>
 #else
 # include "expat/expat.h"
diff --git a/indra/llui/llxuiparser.cpp b/indra/llui/llxuiparser.cpp
index 8fd85a89a1..8cd11b86b3 100644
--- a/indra/llui/llxuiparser.cpp
+++ b/indra/llui/llxuiparser.cpp
@@ -30,7 +30,7 @@
 
 #include "llxmlnode.h"
 #include "llfasttimer.h"
-#ifdef LL_USESYSTEMLIBS
+#if 1
 #include <expat.h>
 #else
 #include "expat/expat.h"
diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h
index 09c7c4fdad..769cf97ba2 100644
--- a/indra/llxml/llxmlnode.h
+++ b/indra/llxml/llxmlnode.h
@@ -30,7 +30,7 @@
 #ifndef XML_STATIC
 #define XML_STATIC
 #endif
-#ifdef LL_USESYSTEMLIBS
+#if 1
 #include <expat.h>
 #else
 #include "expat/expat.h"
diff --git a/indra/llxml/llxmlparser.h b/indra/llxml/llxmlparser.h
index 0f64def6df..9c25727e54 100644
--- a/indra/llxml/llxmlparser.h
+++ b/indra/llxml/llxmlparser.h
@@ -30,7 +30,7 @@
 #ifndef XML_STATIC
 #define XML_STATIC
 #endif
-#ifdef LL_USESYSTEMLIBS
+#if 1
 #include <expat.h>
 #else
 #include "expat/expat.h"
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 7faef8cc41..14f0b52174 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -36,7 +36,7 @@
 #include "llbufferstream.h"
 #include "llfile.h"
 #include "llmenugl.h"
-#ifdef LL_USESYSTEMLIBS
+#if 1
 # include "expat.h"
 #else
 # include "expat/expat.h"
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index 3e0a237905..ca1258e05e 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -43,7 +43,7 @@ class LLVivoxProtocolParser;
 #include "llmutelist.h"
 #include <queue>
 
-#ifdef LL_USESYSTEMLIBS
+#if 1
 # include "expat.h"
 #else
 # include "expat/expat.h"
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
index 08fcec86ac..c2b74eb1dd 100644
--- a/indra/newview/llvoicewebrtc.cpp
+++ b/indra/newview/llvoicewebrtc.cpp
@@ -34,7 +34,7 @@
 #include "llbufferstream.h"
 #include "llfile.h"
 #include "llmenugl.h"
-#ifdef LL_USESYSTEMLIBS
+#if 1
 # include "expat.h"
 #else
 # include "expat/expat.h"
diff --git a/indra/newview/llvoicewebrtc.h b/indra/newview/llvoicewebrtc.h
index ff82d2739d..946a80e874 100644
--- a/indra/newview/llvoicewebrtc.h
+++ b/indra/newview/llvoicewebrtc.h
@@ -43,7 +43,7 @@ class LLWebRTCProtocolParser;
 #include <queue>
 #include "boost/json.hpp"
 
-#ifdef LL_USESYSTEMLIBS
+#if 1
 # include "expat.h"
 #else
 # include "expat/expat.h"