diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-17 16:02:57 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-17 16:02:57 -0700 |
| commit | d0dfffe659b24f5a6bfadc5cc612869e1f08bb93 (patch) | |
| tree | 8df3c672aba2f1aca8e9861bcf7626bd8116b107 /indra/llcommon | |
| parent | 5e60392c273f0c9c5efa765a05414c618381780a (diff) | |
| parent | 375555012f92c1b836f2d122754f9facd050be62 (diff) | |
Merge remote-tracking branch 'origin/develop' into brad/webrtc-voice-develop
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llmemory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index 2c3f66fab8..80cfe554c4 100644 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -134,7 +134,7 @@ public: \ void ll_aligned_free_fallback( void* ptr ); //------------------------------------------------------------------------------------------------ #else - inline void* ll_aligned_malloc_fallback( size_t size, int align ) + inline void* ll_aligned_malloc_fallback( size_t size, size_t align ) { LL_PROFILE_ZONE_SCOPED_CATEGORY_MEMORY; #if defined(LL_WINDOWS) |