diff options
| author | Callum Linden <113564339+callumlinden@users.noreply.github.com> | 2023-02-14 13:53:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-14 13:53:27 -0800 |
| commit | 98f0656f5c21a9469984cc8c916a1310d2fc2849 (patch) | |
| tree | 930755196559c57b629eee54129774edc7e2bfe5 /indra/llcommon/llsdserialize.cpp | |
| parent | a92f08b2bc0ee5a63f678c55f9a9d0ec0c4ff574 (diff) | |
| parent | 3c719cc980c942bc54c6591e33a512562aa92a8b (diff) | |
Merge pull request #82 from KittyBarnett/xcode-14.1
Xcode 14.1
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index b7e316da10..f66c4ff843 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -2193,7 +2193,7 @@ 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; @@ -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, U32* header_size) { const char* deprecated_header = "<? LLSD/Binary ?>"; constexpr size_t deprecated_header_size = 17; |