MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXECUTE -> EXEC and add parenthesis to make MSVC whine less.

develop
Kelly Martin 2012-11-16 13:50:38 -06:00
parent a6fba3daf2
commit 648abee285
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/Process-windows.cpp
Unescape Escape View File

@ -488,7 +488,7 @@ int Process::memDealloc(void *ptr, const int length)
{ {
// can only free the whole region at once // can only free the whole region at once
// vfree returns 0 on error // vfree returns 0 on error
return !VirtualFree(ptr, 0, MEM_RELEASE) return !VirtualFree(ptr, 0, MEM_RELEASE);
} }
int Process::memProtect(void *ptr, const int length, const int prot) int Process::memProtect(void *ptr, const int length, const int prot)
@ -501,11 +501,11 @@ int Process::memProtect(void *ptr, const int length, const int prot)
prot_native = PAGE_NOACCESS; prot_native = PAGE_NOACCESS;
else if (prot == Process::MemProt::READ) else if (prot == Process::MemProt::READ)
prot_native = PAGE_READONLY; prot_native = PAGE_READONLY;
else if (prot == Process::MemProt::READ | Process::MemProt::WRITE) else if (prot == (Process::MemProt::READ | Process::MemProt::WRITE))
prot_native = PAGE_READWRITE; prot_native = PAGE_READWRITE;
else if (prot == Process::MemProt::READ | Process::MemProt::WRITE | Process::MemProt::EXECUTE) else if (prot == (Process::MemProt::READ | Process::MemProt::WRITE | Process::MemProt::EXEC))
prot_native = PAGE_EXECUTE_READWRITE; prot_native = PAGE_EXECUTE_READWRITE;
else if (prot == Process::MemProt::READ | Process::MemProt::EXECUTE) else if (prot == (Process::MemProt::READ | Process::MemProt::EXEC))
prot_native = PAGE_EXECUTE_READ; prot_native = PAGE_EXECUTE_READ;
else else
return -1; return -1;