diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-04-22 16:03:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-04-22 16:03:35 -0400 |
| commit | d00d37d23b68037fed8eeeffe21a87f7597086c3 (patch) | |
| tree | 2ce3ca6ce4038ab967277ebba1ca4b8a599c50e5 /indra/llmessage | |
| parent | 6c8bddca3d5a790934535fdd6f176e28d181d76a (diff) | |
| parent | 776aadf4ef65681084268c3866058172c89b4259 (diff) | |
merge changes for OPEN-199
Diffstat (limited to 'indra/llmessage')
| -rwxr-xr-x | indra/llmessage/llares.h | 2 | ||||
| -rwxr-xr-x | indra/llmessage/llhttpassetstorage.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llares.h b/indra/llmessage/llares.h index 800781ee88..675120c621 100755 --- a/indra/llmessage/llares.h +++ b/indra/llmessage/llares.h @@ -39,7 +39,7 @@ # pragma warning(pop) #endif -#ifdef LL_STANDALONE +#ifdef LL_USESYSTEMLIBS # include <ares.h> #else # include <ares/ares.h> diff --git a/indra/llmessage/llhttpassetstorage.cpp b/indra/llmessage/llhttpassetstorage.cpp index 7dcf160c9b..9a6b1e0eb7 100755 --- a/indra/llmessage/llhttpassetstorage.cpp +++ b/indra/llmessage/llhttpassetstorage.cpp @@ -37,7 +37,7 @@ #include "llvfile.h" #include "llvfs.h" -#ifdef LL_STANDALONE +#ifdef LL_USESYSTEMLIBS # include <zlib.h> #else # include "zlib/zlib.h" |