From ce7682c2a468e926d6b38e4f95bd289a8d26222c Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Wed, 18 Jul 2007 21:22:40 +0000 Subject: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release (only inside indra) (josh) Original log message was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance bos updated it to be: svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance However, it appears it actually was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance ... missing some file additions. --- indra/llxml/llxmlnode.h | 4 ++++ indra/llxml/llxmlparser.h | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'indra/llxml') diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h index 56e66f2f9d..4084a45795 100644 --- a/indra/llxml/llxmlnode.h +++ b/indra/llxml/llxmlnode.h @@ -10,7 +10,11 @@ #define LL_LLXMLNODE_H #define XML_STATIC +#ifdef LL_STANDALONE +#include +#else #include "expat/expat.h" +#endif #include #include "indra_constants.h" diff --git a/indra/llxml/llxmlparser.h b/indra/llxml/llxmlparser.h index 2ef790094e..a378c15265 100644 --- a/indra/llxml/llxmlparser.h +++ b/indra/llxml/llxmlparser.h @@ -10,7 +10,11 @@ #define LL_LLXMLPARSER_H #define XML_STATIC +#ifdef LL_STANDALONE +#include +#else #include "expat/expat.h" +#endif class LLXmlParser { -- cgit v1.2.3