diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-07-09 15:22:12 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-07-09 15:22:12 -0700 |
| commit | 487fce4afaed69268db4fb996e420ba8984101d3 (patch) | |
| tree | 365a4d16f511c083334b5315c6ffc882c558a300 /indra/llmessage | |
| parent | e414dfad51b3747fa20c0023820980f23f1cad2c (diff) | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
Merge with 3.7.11-release
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 0b5d49e322..c727363b60 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 f168ac4ec6..a30140e8f3 100755 --- a/indra/llmessage/llhttpassetstorage.cpp +++ b/indra/llmessage/llhttpassetstorage.cpp @@ -38,7 +38,7 @@ #include "llvfs.h" #include "llxfer.h" -#ifdef LL_STANDALONE +#ifdef LL_USESYSTEMLIBS # include <zlib.h> #else # include "zlib/zlib.h" |