diff options
| author | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2014-10-28 17:12:49 +0200 |
|---|---|---|
| committer | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2014-10-28 17:12:49 +0200 |
| commit | edb7e3450f16bbda7a30ff56a350e0060cb0e623 (patch) | |
| tree | 9f0515e1d480de9ce184db51bcb8d05220c95c44 /indra/llcommon | |
| parent | 3d9406a21ebf54eb6c20a4a33a9967dae3c55176 (diff) | |
MAINT-4435 FIXED build fix patchset2
Diffstat (limited to 'indra/llcommon')
| -rwxr-xr-x | indra/llcommon/llmemory.cpp | 2 | ||||
| -rwxr-xr-x | 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 9ed60ad121..ae11988df8 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 8d826cbc6e..bbf0e1e141 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 |