Merge remote-tracking branch 'jjyg/master'

2012-11-16 13:50:59 -06:00 · 2012-11-16 13:50:59 -06:00 · 1379891270
parent 648abee285 2b087a7081
commit 1379891270
1 changed files with 1 additions and 1 deletions
--- a/library/Process-windows.cpp
+++ b/library/Process-windows.cpp
@ -494,7 +494,7 @@ int Process::memDealloc(void *ptr, const int length)
 int Process::memProtect(void *ptr, const int length, const int prot)
 {
    int prot_native = 0;
-    int old_prot = 0;
+    DWORD old_prot = 0;

    // only support a few constant combinations
    if (prot == 0)