diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-05 13:39:53 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-05 13:39:53 -0700 |
| commit | 81a63ac0886a31a566535a3483e5013f5bc0b424 (patch) | |
| tree | 1bb0319755a5e26e0bc7f9f20632ae8f31538971 /indra/llcommon/llpreprocessor.h | |
| parent | 0f5bbec3747f3ff2b1d580506d35dc080fcd1a98 (diff) | |
| parent | 9818f158366a0df980a2e4b9251177d9a9209cfb (diff) | |
merge with latest from lindenlab/svn-imports-viewer-20
Diffstat (limited to 'indra/llcommon/llpreprocessor.h')
| -rw-r--r-- | indra/llcommon/llpreprocessor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index 4401be1679..bb598a2be1 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -117,7 +117,9 @@ using snprintf_hack::snprintf; #if defined(LL_WINDOWS) #define BOOST_REGEX_NO_LIB 1 #define CURL_STATICLIB 1 +#ifndef XML_STATIC #define XML_STATIC +#endif #endif // LL_WINDOWS |