From edb7e3450f16bbda7a30ff56a350e0060cb0e623 Mon Sep 17 00:00:00 2001
From: ruslantproductengine <ruslantproductengine@lindenlab.com>
Date: Tue, 28 Oct 2014 17:12:49 +0200
Subject: [PATCH] MAINT-4435 FIXED build fix patchset2
---
indra/llcommon/llmemory.cpp | 2 --
indra/llcommon/llstacktrace.cpp | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp
index 9ed60ad1216..ae11988df8d 100755
--- a/indra/llcommon/llmemory.cpp
+++ b/indra/llcommon/llmemory.cpp
@@ -2184,8 +2184,6 @@ void* ll_aligned_malloc_fallback( size_t size, int align )
// call debugger
__asm int 3;
}
- memset(p, 0xaa, for_alloc);
- memset((void*)((char*)p + for_alloc), 0xbb, sysinfo.dwPageSize);
DWORD old;
BOOL Res = VirtualProtect((void*)((char*)p + for_alloc), sysinfo.dwPageSize, PAGE_NOACCESS, &old);
if(FALSE == Res) {
diff --git a/indra/llcommon/llstacktrace.cpp b/indra/llcommon/llstacktrace.cpp
index 8d826cbc6e9..bbf0e1e141f 100755
--- a/indra/llcommon/llstacktrace.cpp
+++ b/indra/llcommon/llstacktrace.cpp
@@ -156,9 +156,9 @@ bool ll_get_stack_trace(std::vector<std::string>& lines)
return false;
}
-void ll_get_stack_trace2(std::vector<std::string>& lines)
+void ll_get_stack_trace_internal(std::vector<std::string>& lines)
{
- return false;
+
}
#endif
--
GitLab