diff options
| author | Dave Parks <davep@lindenlab.com> | 2024-06-14 13:47:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-14 13:47:19 -0500 |
| commit | f4eae44067cfe63fbe5ddd219b1b2463e9de89ef (patch) | |
| tree | d2326d97462cff679a937e801bb2a1da526f0983 /indra | |
| parent | 0ed3483b338376b7a18a05efae6fbc1d4b5db870 (diff) | |
Fix for warnings/errors after Visual Studio update (#1775)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/00-Common.cmake | 3 | ||||
| -rw-r--r-- | indra/llcommon/llmemory.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 4471380c6b..dbbf12bd3d 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -108,6 +108,9 @@ if (WINDOWS) # https://github.com/actions/runner-images/issues/10004#issuecomment-2153445161 # can be removed after the above issue is resolved and deployed across GHA add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR) + + # Allow use of sprintf etc + add_compile_definitions(_CRT_SECURE_NO_WARNINGS) endif (WINDOWS) 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) |