diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-13 10:53:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-13 10:53:10 -0400 |
| commit | 7bb74afb67770fb8a02543a5e3a02a9b6d65bc57 (patch) | |
| tree | d12b00a2308b0fe000b2eaeb3529b31eeb0c2762 /indra/llxuixml | |
| parent | a351c5005eebb03a03f0e79d2efcc5a304fab481 (diff) | |
| parent | 41484c19eeb534330a17aff7e7b6663b86198cfe (diff) | |
Automated merge with ssh://bitbucket.org/merov_linden/viewer-development-storm-137
Diffstat (limited to 'indra/llxuixml')
| -rw-r--r-- | indra/llxuixml/llxuiparser.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llxuixml/llxuiparser.cpp b/indra/llxuixml/llxuiparser.cpp index e1ad9a5c71..9942af6b37 100644 --- a/indra/llxuixml/llxuiparser.cpp +++ b/indra/llxuixml/llxuiparser.cpp @@ -29,7 +29,13 @@ #include "llxuiparser.h" #include "llxmlnode.h" + +#ifdef LL_STANDALONE +#include <expat.h> +#else #include "expat/expat.h" +#endif + #include <fstream> #include <boost/tokenizer.hpp> //#include <boost/spirit/include/qi.hpp> |