diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2023-07-18 16:48:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-18 16:48:33 -0700 |
| commit | ca008cfc3165eefeb42b2894e3e99ecf4c21f0c8 (patch) | |
| tree | 82a2b75f4d6ff4650877b774559558065e9ab81a /indra/llcommon/llsdserialize.cpp | |
| parent | 8e3d4048d4197a40009f04169aeb3ec710cd6fa1 (diff) | |
| parent | ae63ed51aa4437bcca1c4f3813f1f6279facc107 (diff) | |
Merge pull request #292 from secondlife/brad/DRTVWR-559-xcode-14.3
Merge xcode-14.3 compatibility branch into DRTVWR-559
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index b7e316da10..9181600f23 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -2193,9 +2193,9 @@ LLUZipHelper::EZipRresult LLUZipHelper::unzip_llsd(LLSD& data, std::istream& is, LLUZipHelper::EZipRresult LLUZipHelper::unzip_llsd(LLSD& data, const U8* in, S32 size) { U8* result = NULL; - U32 cur_size = 0; + llssize cur_size = 0; z_stream strm; - + constexpr U32 CHUNK = 1024 * 512; static thread_local std::unique_ptr<U8[]> out; @@ -2388,7 +2388,7 @@ U8* unzip_llsdNavMesh( bool& valid, size_t& outsize, std::istream& is, S32 size return result; } -char* strip_deprecated_header(char* in, U32& cur_size, U32* header_size) +char* strip_deprecated_header(char* in, llssize& cur_size, size_t* header_size) { const char* deprecated_header = "<? LLSD/Binary ?>"; constexpr size_t deprecated_header_size = 17; |