diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-12 17:32:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-12 17:32:56 -0400 |
| commit | 93d31d9bfea91d2d5917ea117cef18f82b2a668f (patch) | |
| tree | 3d98f550d354d3c453c3d03165e986103062a49e /indra/llxuixml | |
| parent | f36085b0de9c3c557fd33492312abbbbea6e26a2 (diff) | |
| parent | 8269d4d51cd58fa5c8fc4ac22d9f42041849889d (diff) | |
merge fixes for STORM-374
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> |