diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-07-08 17:29:48 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-07-08 17:29:48 -0400 |
| commit | 29bea5a6b94458e23559bdbeaae5a593100533b6 (patch) | |
| tree | 5bd356450afd8da159542bfd444b653442004a45 /indra/llcommon | |
| parent | 053f436413c01e237accabace4dc5ff1eccca837 (diff) | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
Merge. Refresh from viewer-release after 3.7.11 release.
Diffstat (limited to 'indra/llcommon')
| -rwxr-xr-x | indra/llcommon/llsdserialize.cpp | 2 | ||||
| -rwxr-xr-x | indra/llcommon/llsdserialize_xml.cpp | 2 | ||||
| -rwxr-xr-x | indra/llcommon/llsys.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index b2add301f9..d49ff0feb5 100755 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -34,7 +34,7 @@ #include <iostream> #include "apr_base64.h" -#ifdef LL_STANDALONE +#ifdef LL_USESYSTEMLIBS # include <zlib.h> #else # include "zlib/zlib.h" // for davep's dirty little zip functions diff --git a/indra/llcommon/llsdserialize_xml.cpp b/indra/llcommon/llsdserialize_xml.cpp index e1a91f1367..8d72a1c329 100755 --- a/indra/llcommon/llsdserialize_xml.cpp +++ b/indra/llcommon/llsdserialize_xml.cpp @@ -35,7 +35,7 @@ extern "C" { -#ifdef LL_STANDALONE +#ifdef LL_USESYSTEMLIBS # include <expat.h> #else # include "expat/expat.h" diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 07fe259e47..06e118aa44 100755 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -33,7 +33,7 @@ #include "llsys.h" #include <iostream> -#ifdef LL_STANDALONE +#ifdef LL_USESYSTEMLIBS # include <zlib.h> #else # include "zlib/zlib.h" |