From 36fccc3888c5dc318a8a235da8a5cae4faeb637d Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 30 Apr 2008 23:30:09 +0000
Subject: svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r
 84579:85724 maint-ui-11-qa).

---
 indra/llxml/llxmlnode.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/llxml/llxmlnode.h')

diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h
index e2019a8e60..d4b4a4655b 100644
--- a/indra/llxml/llxmlnode.h
+++ b/indra/llxml/llxmlnode.h
@@ -32,7 +32,9 @@
 #ifndef LL_LLXMLNODE_H
 #define LL_LLXMLNODE_H
 
-#define XML_STATIC
+#ifndef XML_STATIC
+#define XML_STATIC 1
+#endif
 #ifdef LL_STANDALONE
 #include <expat.h>
 #else
-- 
cgit v1.2.3