diff options
| author | James Cook <james@lindenlab.com> | 2008-04-30 23:30:09 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2008-04-30 23:30:09 +0000 |
| commit | 36fccc3888c5dc318a8a235da8a5cae4faeb637d (patch) | |
| tree | 021e439fe9fa3a285062d70bf0b8c0f799471681 /indra/llxml | |
| parent | cf2a96375f62316b98c2dddd57f812f7565584be (diff) | |
svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 maint-ui-11-qa).
Diffstat (limited to 'indra/llxml')
| -rw-r--r-- | indra/llxml/llxmlnode.h | 4 | ||||
| -rw-r--r-- | indra/llxml/llxmlparser.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h index e2019a8e60..d4b4a4655b 100644 --- a/indra/llxml/llxmlnode.h +++ b/indra/llxml/llxmlnode.h @@ -32,7 +32,9 @@ #ifndef LL_LLXMLNODE_H #define LL_LLXMLNODE_H -#define XML_STATIC +#ifndef XML_STATIC +#define XML_STATIC 1 +#endif #ifdef LL_STANDALONE #include <expat.h> #else diff --git a/indra/llxml/llxmlparser.h b/indra/llxml/llxmlparser.h index d86af69bef..747cf3d0ca 100644 --- a/indra/llxml/llxmlparser.h +++ b/indra/llxml/llxmlparser.h @@ -32,7 +32,9 @@ #ifndef LL_LLXMLPARSER_H #define LL_LLXMLPARSER_H -#define XML_STATIC +#ifndef XML_STATIC +#define XML_STATIC 1 +#endif #ifdef LL_STANDALONE #include <expat.h> #else |