diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-25 11:38:33 +0200 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-25 11:38:33 +0200 |
| commit | 03acf85c36f2de235d6bf8a07b8a253c30679570 (patch) | |
| tree | 510ede31d99e8cc3a2d05f378206125d67f283c5 | |
| parent | 807d835c2bfc5d794a74f9690d1fafbe55ff88cc (diff) | |
| parent | e3d61c92368189c34a406070c97a62ef0958a9f9 (diff) | |
CTS-320 (part 2 of 3) use system zlib for standalone
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index ef9f09bd23..f31d0f0204 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -142,6 +142,7 @@ Blakar Ogre blino Nakamura VWR-17 Boroondas Gupte + CTS-320 SNOW-278 VWR-233 WEB-262 diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index c341b15539..b1e88b0f8f 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -39,7 +39,12 @@ #include <iostream> #include "apr_base64.h" -#include "zlib/zlib.h" // for davep's dirty little zip functions + +#ifdef LL_STANDALONE +# include <zlib.h> +#else +# include "zlib/zlib.h" // for davep's dirty little zip functions +#endif #if !LL_WINDOWS #include <netinet/in.h> // htonl & ntohl |