diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-18 21:22:40 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-18 21:22:40 +0000 |
| commit | ce7682c2a468e926d6b38e4f95bd289a8d26222c (patch) | |
| tree | 80535a3916676294d640b4ce47c1895d0a27cd1b /indra/llxml | |
| parent | e1ab7d8a30cc40cbd1d471c67def21508c82ff49 (diff) | |
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.
Diffstat (limited to 'indra/llxml')
| -rw-r--r-- | indra/llxml/llxmlnode.h | 4 | ||||
| -rw-r--r-- | indra/llxml/llxmlparser.h | 4 |
2 files changed, 8 insertions, 0 deletions
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 <expat.h> +#else #include "expat/expat.h" +#endif #include <map> #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 <expat.h> +#else #include "expat/expat.h" +#endif class LLXmlParser { |