livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-4435 FIXED build fix patchset2

master
ruslantproductengine 2014-10-28 17:12:49 +02:00
parent 3d9406a21e
commit edb7e3450f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llmemory.cpp
View File

@ -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) {

4
indra/llcommon/llstacktrace.cpp
View File

@ -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