diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-22 17:39:03 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-22 17:39:03 -0700 |
| commit | a0714f01804a2a2220bd72c3adf06f097ad21b73 (patch) | |
| tree | db304a8eca349020b48ae927fd8a534264a6ed83 /indra/llxuixml | |
| parent | e3ecffc180ae50a0e8b726a061ec39cbe591326e (diff) | |
| parent | de6f7e19c44d267d3224c56941c2ab27677c406f (diff) | |
Merge with 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> |