diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-12 10:58:42 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-12 10:58:42 -0400 |
| commit | 28d8612cf767d42a15c6cc8ee030bdcfab496987 (patch) | |
| tree | be56c82c01f3b4e10ad2a38a2d2f8f9939f62a3b /indra/llxuixml | |
| parent | a8fbfa40ba6153668e1f713ae0e128224b4f400f (diff) | |
| parent | 3f43a36d3430e94046d40cb898a9fd34cce0f7d5 (diff) | |
merge up to latest viewer-development
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> |