diff options
| author | wm4 <wm4@mplayer2.org> | 2012-03-16 18:57:23 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-03-16 19:14:44 +0100 |
| commit | 6de8120822c2dd9c50ef23b4977421651396f1ae (patch) | |
| tree | 11a977608cfc9f50cffbce4a879dd8e9b33b029c /loader/ext.c | |
| parent | 0eb21226cbfdd200f2aea5d3a9db2cdbff4773a5 (diff) | |
| parent | a8168102668337f3c11619bea7e744fc245adff1 (diff) | |
| download | mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.bz2 mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.xz | |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
command.c
mp_core.h
mplayer.c
screenshot.c
Diffstat (limited to 'loader/ext.c')
| -rw-r--r-- | loader/ext.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/loader/ext.c b/loader/ext.c index d91ab4a3de..feab985167 100644 --- a/loader/ext.c +++ b/loader/ext.c @@ -443,12 +443,12 @@ LPVOID WINAPI VirtualAlloc(LPVOID address, DWORD size, DWORD type, DWORD protec if (type&MEM_RESERVE && (unsigned)address&0xffff) { size += (unsigned)address&0xffff; - address = (unsigned)address&~0xffff; + address = (void*)((unsigned)address&~0xffff); } pgsz = sysconf(_SC_PAGESIZE); if (type&MEM_COMMIT && (unsigned)address%pgsz) { size += (unsigned)address%pgsz; - address -= (unsigned)address%pgsz; + address = (void*)((unsigned)address - (unsigned)address%pgsz); } if (type&MEM_RESERVE && size<0x10000) size = 0x10000; @@ -531,7 +531,6 @@ LPVOID WINAPI VirtualAlloc(LPVOID address, DWORD size, DWORD type, DWORD protec WIN_BOOL WINAPI VirtualFree(LPVOID address, SIZE_T dwSize, DWORD dwFreeType)//not sure { virt_alloc* str=vm; - int answer; //printf("VirtualFree(0x%08X, %d, 0x%08X)\n", (unsigned)address, dwSize, dwFreeType); while(str) @@ -542,7 +541,7 @@ WIN_BOOL WINAPI VirtualFree(LPVOID address, SIZE_T dwSize, DWORD dwFreeType)//n continue; } //printf(" VirtualFree(...) munmap(0x%08X, %d)\n", (unsigned)str->address, str->mapping_size); - answer=munmap(str->address, str->mapping_size); + munmap(str->address, str->mapping_size); if(str->next)str->next->prev=str->prev; if(str->prev)str->prev->next=str->next; if(vm==str)vm=str->prev; |